|
|
1dfdcfcb7e
|
finished removing using namespace std
|
2018-05-24 15:24:01 +02:00 |
|
|
|
40a7b3983a
|
put some locking in stop acquisition and startandreadallnowait (bugs threadpool with more evernts than normal due to main and processing thread with no locks for detector releated stuff, zmqthreadpool not required, r_restreamstop moved to status stop when idle
|
2017-12-08 11:40:07 +01:00 |
|
|
|
386ef7766c
|
zmq streaming should work with external gui now
|
2017-11-27 16:01:12 +01:00 |
|
|
|
45ee8b2a2b
|
changes usleep back to normal in postprocessing
|
2017-09-20 18:27:54 +02:00 |
|
|
|
fda9c85bb3
|
included threaded 0 as a possibility
|
2017-09-20 17:07:51 +02:00 |
|
|
|
a95e2efdb0
|
parallelized settimer, setfileindex, setonline, setreceiveronline, getreceiverstatus, resetframescaught, setFrameIndex, setFileName, getFramesCaughtByReceiver; added getFramesCaughtbyAnyreceiver to avoid threadpool and to use in post processing
|
2017-09-18 16:47:22 +02:00 |
|
|
|
15424149cd
|
removed leak from postprocessing, moved delete task to earlier in threadpool and deleting threadpool
|
2017-05-12 10:32:16 +02:00 |
|
|
|
445da80df8
|
resolved warnings, also from esrf: todo: include changes in zmq
|
2017-05-01 13:11:10 +02:00 |
|
|
|
987aeda6fb
|
sorted out problem with CPU read out
|
2016-12-22 17:24:53 +01:00 |
|
|
|
3eea80a121
|
compiles after merging
|
2016-12-19 13:50:25 +01:00 |
|
|
|
68b13a0ecd
|
merged to developer
|
2016-12-19 12:26:53 +01:00 |
|
|
|
12cd3d07a2
|
some changes for jctb
|
2016-12-19 12:05:59 +01:00 |
|
|
|
09d146ee55
|
changed a printout
|
2016-11-22 11:39:47 +01:00 |
|
|
|
cb879c61ca
|
changes for new chipterboard -now works with reduced dynamic range and analog/digital readout
|
2016-11-09 11:36:59 +01:00 |
|
|
|
754a4f8bdc
|
q for quit
|
2016-11-02 16:37:37 +01:00 |
|
|
|
40babc23a3
|
progress uncommented
|
2016-11-02 16:24:23 +01:00 |
|
|
|
941b3dbb02
|
progress uncommented
|
2016-11-02 16:09:22 +01:00 |
|
|
|
f0ac9a2e9c
|
back to not asking getframescaught
|
2016-11-01 15:59:43 +01:00 |
|
|
|
1f3a418d93
|
make t crash
|
2016-11-01 15:02:14 +01:00 |
|
|
|
7fc82723b5
|
some changes
|
2016-11-01 14:04:31 +01:00 |
|
|
|
7374a37115
|
back with checking online, got rid of getframescaught altogether
|
2016-11-01 10:03:38 +01:00 |
|
|
|
b28c68127a
|
check for why gui doesnt show all data
|
2016-10-25 16:48:04 +02:00 |
|
|
|
64094be4e3
|
check for why gui doesnt show all data
|
2016-10-25 16:45:52 +02:00 |
|
|
|
9f28cc686c
|
done
|
2016-10-18 11:10:42 +02:00 |
|
|
|
16adb444b9
|
changed back the delay between framescaught
|
2016-10-07 13:12:57 +02:00 |
|
|
|
d54392c6eb
|
increased delay to get framescaught from receiver for acquire form command line
|
2016-10-07 12:45:34 +02:00 |
|
|
|
de2de6315c
|
somewhere
|
2016-10-06 08:44:00 +02:00 |
|
|
|
1da4b07e73
|
works, need to do json header and send dataready
|
2016-09-15 17:15:55 +02:00 |
|
|
|
a821442b1a
|
almosst
|
2016-09-15 12:16:01 +02:00 |
|
|
|
0f9a841c4a
|
almost done
|
2016-09-15 10:17:16 +02:00 |
|
|
|
652d29f2d9
|
almost done
|
2016-09-09 17:51:36 +02:00 |
|
|
|
09d0d3ba22
|
parallized setup receiver
|
2016-07-07 15:55:22 +02:00 |
|
|
|
07f1bd5c82
|
mid way, had to change to fix bug
|
2016-02-08 10:40:54 +01:00 |
|
|
|
5c239ad45f
|
data call back form receiver includes both x and y dimensions
|
2015-12-16 15:01:00 +01:00 |
|
|
|
291fe8bc22
|
socket disconnecting in receiver
|
2015-11-19 11:10:59 +01:00 |
|
|
|
c43af96487
|
some changes refactoring and reducing time spent
|
2015-11-13 17:47:44 +01:00 |
|
|
|
62c92dd364
|
changing to random read when no gui at beginnning of acquire
|
2015-11-12 15:05:56 +01:00 |
|
|
|
a770389c90
|
including subframe index from receiver to client and also sending this to gui
|
2015-09-23 11:50:02 +02:00 |
|
|
|
79e13c6db7
|
using framescaught instead of frameindex in gui to get data
|
2015-08-19 15:48:14 +02:00 |
|
|
|
c9a952a748
|
changing file name prefix orders, reset frames caught command from command line
|
2015-08-19 11:38:09 +02:00 |
|
|
|
a3a2db1f73
|
fixed 32 progress problem, and increased debugging
|
2015-06-30 17:20:23 +02:00 |
|
|
|
b11b7c1c09
|
beb stop acquisiion return, some minor changes, increased the check time for receiver frame after detector read out done using acquisiingDone variable
|
2015-06-12 17:45:43 +02:00 |
|
|
|
7e44648da9
|
different between acquisition index and frame index
|
2015-03-12 12:22:19 +01:00 |
|
|
|
7a2e42d59a
|
changed the way gui polls receiver for data for nth frame and otherwise
|
2015-03-10 15:03:08 +01:00 |
|
|
|
cdd18182a8
|
resolved client side memory leak caused from gui
|
2015-03-04 16:24:03 +01:00 |
|
|
|
2c2d2171d2
|
get the last frame in eiger with acquiringdone
|
2015-02-24 16:10:31 +01:00 |
|
|
|
d658799b20
|
eiger reading master slave top bottom configuration from firmware;not reading from file anymore, serial is hardcoded for each master: also bug changes in gui getting frame from receiver in postprocessing
|
2015-02-23 15:18:02 +01:00 |
|
|
|
9ac08e5e76
|
supports frames with many samples for jctb - obtained by faking number of chips in case of many samples
|
2015-01-30 12:58:53 +01:00 |
|
|
|
a149d7fb2e
|
usleep adeed to reduce CPU consumption
|
2015-01-08 10:29:30 +01:00 |
|
|
|
255f9e3fee
|
eiger: trimbits changed such that it works for multi modules, ;general: loading multislsdetectr list with y dir first, updating the readframefromreceiver to load all the data interswapped for 16 bit; nthframe works better
|
2014-12-11 14:16:43 +01:00 |
|
