|
38a6393dde
|
fixed probelem with multiThreadedInterpolatingDetector
|
2018-10-16 17:17:24 +02:00 |
|
|
4aa720eecb
|
added data structure for moench03 rectangual pixels module 019
|
2018-10-11 09:32:47 +02:00 |
|
|
ae8678cdc2
|
New Zmq header staructur implemented and works, still different number of pixels in the GUI should be fixed (but it does not crash)
|
2018-09-25 09:36:47 +02:00 |
|
|
19e7ced332
|
moench zmq process implemented - command implementation is missing
|
2018-09-13 16:07:43 +02:00 |
|
|
f288390255
|
Zmq communication uses additional headers, moench processing fixed
|
2018-09-11 17:05:11 +02:00 |
|
|
83600fcb15
|
Added data structure for moench02 dynamic gain switching
|
2018-08-17 12:29:07 +02:00 |
|
|
921ae01bbe
|
jungfrau module data, fixel moench02 for jctb and jctb server actualized for both buses
|
2018-08-13 16:27:36 +02:00 |
|
|
52b1e98726
|
merge
|
2018-08-08 12:06:14 +02:00 |
|
|
df75fef6f6
|
reordered moenchExecutables
|
2018-08-08 11:27:46 +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 |
|
|
05055eb283
|
slsReceiver: deleting slsReceiverUsers object before calling start() gives seg fault
|
2018-08-03 09:32:31 +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 |
|
|
e38e500e16
|
manual example api: fixed the makefile include
|
2018-07-30 18:36:49 +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 |
|
|
73fcef5f6d
|
slsReceiverSoftware: bitset storage in case the libarary changes contiguous representation, also changed hdf5 representation from 512 byte (to_string) to just passing char* to keep at 64 bytes
|
2018-07-30 12:05:22 +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 |
|
|
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 |
|