|
|
0bea688a83
|
changes for external gui
|
2017-08-23 19:06:40 +02:00 |
|
|
|
bdccddfe97
|
in between
|
2017-08-23 18:24:48 +02:00 |
|
|
|
e8d83a085f
|
moved receiver start to status start and to startandreadall (acquire), parallelized status start, moved prepare and clean up to multi level and called by start and stop receiver for gotthard, moench and propix
|
2017-08-10 18:46:10 +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 |
|
|
|
374b07a126
|
merge developer
|
2017-07-03 17:42:06 +02:00 |
|
|
|
f944d7cae4
|
made updatereceiver to actually update client in parameters that it can
|
2017-07-03 17:37:24 +02:00 |
|
|
|
b4309a9f60
|
changed jungfrau temperature conversion but binary to follow
|
2017-07-03 14:45:44 +02:00 |
|
|
|
99dad79572
|
Somewhere
|
2017-07-03 13:46:06 +02:00 |
|
|
|
c2980b3c44
|
changes for setting threshold without trimbits for eiger
|
2017-06-28 10:24:07 +02:00 |
|
|
|
1ed4407c11
|
parallelizing adcs and dacs
|
2017-06-23 17:26:46 +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 |
|
|
|
911ff49238
|
changes for merges from 2.3 incl standard packet header
|
2017-03-20 11:22:07 +01:00 |
|
|
|
4b388f56b2
|
fixed gui for new header
|
2017-03-20 09:27:38 +01:00 |
|
|
|
7e00d9f395
|
Merge branch 'developer' into hdf5
|
2017-03-03 10:06:34 +01:00 |
|
|
|
fa6d18e9b2
|
moving subframenumber into a 32 bit number
|
2017-02-28 15:29:53 +01:00 |
|
|
|
2024eb5d6e
|
gui works
|
2017-02-28 13:14:18 +01:00 |
|
|
|
19460a03f5
|
sending position id and num detectors in x and y dir
|
2017-02-21 15:13:27 +01:00 |
|
|
|
5287441a65
|
removed warning
|
2017-02-07 08:52:05 +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 |
|
|
|
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 |
|
|
|
44d6b0ffc0
|
fixed time interval in receiveR
|
2016-11-10 14:37:18 +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 |
|
|
|
79d5a24af4
|
debugging
|
2016-11-04 12:02:37 +01:00 |
|
|
|
4b99ff7fbe
|
reset fpga implemented, changed receiver configuration warning prints, powerchip implemented
|
2016-11-03 12:31:34 +01:00 |
|
|
|
c5e7d44b15
|
looks done
|
2016-10-06 13:49:40 +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 |
|
|
|
904d21d0be
|
only missing data left to be handled in zmqthread in receiver
|
2016-09-19 17:21:23 +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 |
|
|
|
c0db1a89a8
|
deactivate for eiger
|
2016-08-02 10:32:37 +02:00 |
|
|
|
d3a7d3bad3
|
something
|
2016-03-10 17:25:47 +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 |
|
|
|
ba377ec273
|
Command adcreg added to write to adc registers
|
2015-05-04 13:48:46 +02:00 |
|
|
|
7e44648da9
|
different between acquisition index and frame index
|
2015-03-12 12:22:19 +01:00 |
|
|
|
85ccf64175
|
print receiver configurations for all detectors added
|
2015-03-02 13:56:23 +01:00 |
|
|
|
327c2106df
|
Some fixes for the CTB
|
2014-10-14 17:43:25 +02:00 |
|
