|
|
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 |
|
|
|
3b6ead7783
|
slsReceiver: HDF5: unlimited max dimension in x (#numImages), x dim gets incremented by #frames when it gets an extra image, removed virtual_ naming in parameter names, small cased parameter names
|
2018-07-18 14:05:31 +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 |
|
|
|
6bb7195a2c
|
slsReceiver: master file limited by size of 1000 bytes
|
2018-07-17 15:41:43 +02:00 |
|
|
|
53423a42ac
|
slsDetectorSoftware eiger and jungfrau server version API updated
sophieesrf
|
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 |
|
|
|
f5a86bbfe1
|
slsReceiverSoftware: removed hdf5 static cpp file
|
2018-07-10 12:31:55 +02:00 |
|
|
|
9af0ec74b6
|
slsReceiver: updated help in slsMultiReceiver
|
2018-07-06 16:32:42 +02:00 |
|
|
|
45de361b22
|
slsReceiver: added an executable slsMultiReceiver to have the option to have one process create multiple child processes for multiple receivers with configurable tcp port and callback enable
|
2018-07-06 16:26:29 +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 |
|
|
|
7c29327b47
|
saving bit field in hdf5 as string of 512 bytes instead of 512 bits for the time being, will be updated when a better option is figured out
|
2018-07-06 12:00:35 +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 |
|
|
|
ca8cb33569
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2018-06-29 14:53:07 +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 |
|
Gemma Tinti
|
7e16f3ebeb
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2018-06-29 13:47:48 +02:00 |
|
Gemma Tinti
|
233c145791
|
manual
|
2018-06-29 13:47:34 +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 |
|
|
|
ed1135566a
|
slsReceiver: maximum frames per file written to master files for both binary and hdf5, note the version number change for these master file format
|
2018-06-28 18:30:34 +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 |
|
|
|
144bd7124b
|
updated clean shared memory script if anyone is using it
|
2018-06-28 10:48:42 +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 |
|
Gemma Tinti
|
54fc63dd55
|
manual
|
2018-06-22 15:28:33 +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 |
|
Gemma Tinti
|
283dfa2b05
|
manual
|
2018-06-13 11:39:52 +02:00 |
|
Gemma Tinti
|
5316fed5d4
|
manual
|
2018-06-13 11:38:45 +02:00 |
|
Gemma Tinti
|
dda013a85b
|
manual
|
2018-06-12 19:02:04 +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 |
|
Gemma Tinti
|
eba0fa277d
|
manual
|
2018-06-12 15:52:19 +02:00 |
|
