|
|
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 |
|
|
|
18422ce215
|
setbit and clear bit moved to slsdet, readreg, writereg,setbit,clearbit in multi cannot give -1, instead api gives error if checked
|
2017-12-01 09:18:42 +01:00 |
|
|
|
ca855e6d39
|
restream stop from receiver
|
2017-11-30 18:37:11 +01:00 |
|
|
|
2227265357
|
removed external gui flag, acquiring flag is now not reset in stop acquisition, slsdet does not have acquiring flag anymore, busy accomodating acquiringflag, acquire cleanup, in acquire made lock for receiver more local, moved setacquiringflag false to bottom of acquire
|
2017-11-30 16:25:23 +01:00 |
|
|
|
1fce54ec4b
|
zmqport in users fixed
|
2017-11-28 10:35:06 +01:00 |
|
|
|
d1eab6f750
|
updated slsdetector users for zmqport set up
|
2017-11-28 09:24:40 +01:00 |
|
|
|
386ef7766c
|
zmq streaming should work with external gui now
|
2017-11-27 16:01:12 +01:00 |
|
|
|
16e4fbf8dd
|
receiver read freq should save value in shm even if no receiver present
|
2017-11-23 18:21:54 +01:00 |
|
|
|
a0c014eb7d
|
changed rate correction back to what it was before in users class, enabling sets defaults
|
2017-11-20 15:14:01 +01:00 |
|
|
|
f647bdaa48
|
updated users class to reflect zmq changes (separation), fixed warnings
|
2017-11-17 08:46:43 +01:00 |
|
|
|
4097c37b31
|
in between
|
2017-11-16 16:01:31 +01:00 |
|
|
|
2b0d07387a
|
in between separating datastreaming in client and receiver
|
2017-11-15 17:16:47 +01:00 |
|
|
|
ef257d12e7
|
prev bug fix of ratecorr for eiger from users, made simpler
|
2017-11-14 09:13:32 +01:00 |
|
|
|
7e0af1cc7c
|
bugfix: users rate correction able to set for eiger
|
2017-11-14 09:08:08 +01:00 |
|
|
|
af98d2bb53
|
added silent mode in receiver during real time acquisition, doesnt print packet loss regularly or file name created each time
|
2017-09-27 10:09:02 +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 |
|
|
|
0bea688a83
|
changes for external gui
|
2017-08-23 19:06:40 +02:00 |
|
|
|
931a5840e8
|
changes to gotthard server to include write adc, and also changes to fix the dma=dma+1
|
2017-07-11 10:54:21 +02:00 |
|
|
|
c2980b3c44
|
changes for setting threshold without trimbits for eiger
|
2017-06-28 10:24:07 +02:00 |
|
|
|
e2e25f6e62
|
changed API for setting network parameter to remove memory leak, fixed lock issues in streaming print outs to gui, deleted return from threadpool in the right place
|
2017-06-19 14:29:45 +02:00 |
|
|
|
7e00d9f395
|
Merge branch 'developer' into hdf5
|
2017-03-03 10:06:34 +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 |
|
|
|
b403aa20a6
|
Merge branch '2.2-rc' into hdf5
|
2016-12-16 14:51:08 +01:00 |
|
|
|
64843c1c76
|
made the scans work, where the the dummy message from rxr doesnt stop it from listening for the scans/measurement, only at set join thread
|
2016-12-16 14:46:54 +01:00 |
|
|
|
e7621a6cd0
|
moving towards c++ api
|
2016-12-12 14:24:11 +01:00 |
|
|
|
466f1506a5
|
bottom is defined as flippeddatax in config file, not anymore as argument for receiver
|
2016-11-30 10:36:34 +01:00 |
|
|
|
52dbb7f9fc
|
smaller changes to make arguments const
|
2016-11-25 12:22:00 +01:00 |
|
|
|
394526a9c3
|
removed zmq threads from client and made it receive packets via for loop
|
2016-11-22 11:05:42 +01:00 |
|
|
|
4b99ff7fbe
|
reset fpga implemented, changed receiver configuration warning prints, powerchip implemented
|
2016-11-03 12:31:34 +01:00 |
|
|
|
a7e8ff1c42
|
back
|
2016-10-18 14:05:05 +02:00 |
|
|
|
de5037ae2b
|
switched
|
2016-10-18 12:19:20 +02:00 |
|
|
|
3a6d97b4f3
|
trying
|
2016-10-18 12:08:11 +02:00 |
|
|
|
1bade91254
|
almost there
|
2016-10-18 08:43:16 +02:00 |
|
|
|
6da59ca382
|
somewhere, but weird threads
|
2016-10-05 15:26:58 +02:00 |
|
|
|
984698efad
|
merged with developer a lot of bug fixes from 14 sep to 30 sep
|
2016-10-04 13:36:04 +02:00 |
|
|
|
5f4a4b0d90
|
maybe fixed 16 bit rate corr eiger
|
2016-09-23 17:15:16 +02:00 |
|
|
|
d0501c3139
|
creating and destroying sockets for each receiver start and stop in a single acquisition (to deal with scans etc)
|
2016-09-21 16:37:29 +02:00 |
|
|
|
a1df8bdc15
|
done for eiger, some checks for frameindex=-1,socket closing earlier than last socket etc
|
2016-09-20 15:11:39 +02:00 |
|
|
|
1263e80d21
|
done
|
2016-09-16 12:49:27 +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 |
|
|
|
652d29f2d9
|
almost done
|
2016-09-09 17:51:36 +02:00 |
|
|
|
5c239ad45f
|
data call back form receiver includes both x and y dimensions
|
2015-12-16 15:01:00 +01:00 |
|
|
|
c097dfc8b3
|
two acquires at the same tiem should not be possile. using shared memory to set flag, made all connect use the standard connectControl etc
|
2015-11-20 16:28:48 +01:00 |
|
|
|
e0464ef782
|
pulsing client side, and bug fix server side for reset partially
|
2015-11-19 16:15:59 +01:00 |
|
|
|
8b0895add0
|
reset counter bit in eiger detector partially or completely
|
2015-11-17 16:39:36 +01:00 |
|
|
|
66db11421f
|
implemented fifo depth configurable from client
|
2015-11-17 10:30:53 +01:00 |
|
|
|
a770389c90
|
including subframe index from receiver to client and also sending this to gui
|
2015-09-23 11:50:02 +02:00 |
|
|
|
cae286941a
|
added subframe exposure time settable
|
2015-09-03 15:16:48 +02:00 |
|
