|
|
ab7e63c20f
|
Moved sls_detector_exceptions to sls_receiver_exceptions & its consequences
|
2018-08-08 15:43:29 +02:00 |
|
|
|
52b1e98726
|
merge
|
2018-08-08 12:06:14 +02:00 |
|
|
|
44fdc46c11
|
some changes in the moench executables
|
2018-08-08 10:23:35 +02:00 |
|
|
|
147194e8af
|
slsDetector: connect stop socket in checkonline so that it does not stick to its initialized default file descriptor zero (which gets closed upon socket deletion)
|
2018-08-03 14:54:32 +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 |
|
|
|
e9cc91698e
|
Merge branch '3.3.0-rc' into developer
|
2018-07-26 13:46:58 +02:00 |
|
|
|
6213b5e07a
|
gotthard server and slsDetectorSoftware: more accuracy when converting from double to int64_t by adding 0.5, improved clock precision of gotthard from 32.1 to 32.007729
|
2018-07-26 13:46:41 +02:00 |
|
|
|
08aacf76ac
|
Merge branch '3.3.0-rc' into developer
|
2018-07-23 15:03:13 +02:00 |
|
|
|
711e0d771e
|
slsDetectorSoftware: users setSettings(-1) gives undefined settings. fixed
|
2018-07-23 15:03:00 +02:00 |
|
|
|
2fc98c7a54
|
updated binaries, eiger jungfrau
|
2018-07-18 15:04:47 +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 |
|
|
|
53423a42ac
|
slsDetectorSoftware eiger and jungfrau server version API updated
|
2018-07-10 15:04:59 +02:00 |
|
|
|
c2b1eef75c
|
slsDetectorSoftware: removed warnings, and made compilable via make
|
2018-07-10 14:58:18 +02:00 |
|
|
|
260f237990
|
slsDetectorSoftware, changing shm name prefix for environment
|
2018-07-06 15:41:09 +02:00 |
|
|
|
37dd5fb902
|
slsDetectorSoftware: sharedmemory, appends environment variable of SLS_SHM_NAME to shm name
|
2018-07-06 15:30:06 +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 |
|
|
|
7db6b7bca8
|
slsDetectorSoftware: command line should print same file when loading or saving to trimbits file
|
2018-06-29 14:52:52 +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 |
|
|
|
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 |
|
|
|
14d227f8db
|
jungfrau server fix (3.1.3): delay after trigger set at testbus
|
2018-06-28 16:19:19 +02:00 |
|
|
|
f6660c0dac
|
slsDetectorSoftware: updated shared memory to have _sls_ instead of _single_, and updated versions
|
2018-06-28 10:37:46 +02:00 |
|
|
|
73ac8bab38
|
commenting out printout
|
2018-06-28 08:58:34 +02:00 |
|
|
|
d76568d6d9
|
jungfrau server, merge fix binaries
|
2018-06-28 08:55:14 +02:00 |
|
|
|
72f47b2375
|
Merge branch 'developer' into sharedmem
|
2018-06-28 08:51:25 +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 |
|
|
|
d7831f6c64
|
sharedmem: command line refactor, fixing to do
|
2018-06-25 19:18:00 +02:00 |
|
|
|
a97b725f43
|
sharedmem: command line done, fixing to do
|
2018-06-25 19:14:41 +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 |
|
|
|
2dece5c635
|
jungfrau server: reading power status (fixed in firmware)
|
2018-06-06 16:15:30 +02:00 |
|
|
|
24db58e615
|
jungfrau server required firmware version on server changed from 0x2018 to 0x18
|
2018-06-06 10:23:06 +02:00 |
|
|
|
bab7d8e3fb
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2018-06-01 11:05:03 +02:00 |
|
|
|
2339fb2a0e
|
slsDetectorSoftware: bug fix, changing dr didnt change the databytesinclgappixels immediately
|
2018-06-01 11:04:54 +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 |
|
