|
|
0bea688a83
|
changes for external gui
|
2017-08-23 19:06:40 +02:00 |
|
|
|
19d973f5d6
|
Merge branch '3.0' into externalgui
|
2017-08-23 18:26:46 +02:00 |
|
|
|
6332025bbc
|
frames caught in 9m was only looking at 1st receiver, now made to average
|
2017-08-23 18:26:25 +02:00 |
|
|
|
bdccddfe97
|
in between
|
2017-08-23 18:24:48 +02:00 |
|
|
|
4f28df03ab
|
trials
|
2017-08-22 19:43:26 +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 |
|
|
|
389f356a3a
|
high voltage reflects the master only, if 2 masters reflects -1
|
2017-08-10 11:09:44 +02:00 |
|
|
|
558e5e2e9a
|
added busy command, converted get frames etc to an integer output
|
2017-08-08 19:15:20 +02:00 |
|
|
|
e3667f6827
|
can set zmqport from receiver
|
2017-07-13 12:18:07 +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 |
|
|
|
f944d7cae4
|
made updatereceiver to actually update client in parameters that it can
|
2017-07-03 17:37:24 +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 |
|
|
|
57ae305c7d
|
parallelized enabledatastreaming
|
2017-06-22 16:59:41 +02:00 |
|
|
|
bbbd4731d7
|
ensuring acquire, p receiver start and the gui enables and disables data streaming accordingly. those with api will have to know what they want before acquiring
|
2017-06-22 16:44:29 +02:00 |
|
|
|
fe73e09aa4
|
removing unnecessary printouts, ensuring lost packets are 0xff
|
2017-06-21 17:05:47 +02:00 |
|
|
|
48f853aa1a
|
fixed gui getting stuck (wrong datathreadmask more than 64 bits cuz of 72 sockets)
|
2017-06-20 12:38:59 +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 |
|
|
|
15424149cd
|
removed leak from postprocessing, moved delete task to earlier in threadpool and deleting threadpool
|
2017-05-12 10:32:16 +02:00 |
|
|
|
0722ef3125
|
changes including warnings and zmq
|
2017-05-04 17:52:47 +02:00 |
|
|
|
066550d38c
|
zmq changes for no dummy data end
|
2017-05-01 14:02:13 +02:00 |
|
|
|
445da80df8
|
resolved warnings, also from esrf: todo: include changes in zmq
|
2017-05-01 13:11:10 +02:00 |
|
|
|
536f8937cb
|
merging
|
2017-03-24 09:10:09 +01:00 |
|
|
|
c47f2f3449
|
solved the gui 4 bit bug where no data was displayed: due to byterperchannel being int and a 0
|
2017-03-23 13:31:22 +01:00 |
|
|
|
aae4e3f993
|
removed unnessary printout
|
2017-03-20 11:22:35 +01: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 |
|
|
|
9b3f4a3a66
|
commonFiles/error_defs.h
|
2017-02-03 14:34:05 +01:00 |
|
|
|
87ce1ed736
|
moved tau to settings file, removed gain and offset, setting threshold loads settings file, setting threshold only sets client variable
|
2017-02-03 12:29:44 +01: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 |
|
|
|
bd1601c2eb
|
fixwed the printing of errors but not error message
|
2016-12-19 11:37:14 +01:00 |
|
|
|
d555bc6e75
|
fixwed the printing of errors but not error message
|
2016-12-19 11:33:16 +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 |
|
|
|
a971d87008
|
Merge branch '2.2-rc' into hdf5
|
2016-12-13 13:23:06 +01:00 |
|
|
|
2a508435c7
|
change the filenaming according to det position and not det id
|
2016-12-13 11:41:27 +01:00 |
|
|
|
e7621a6cd0
|
moving towards c++ api
|
2016-12-12 14:24:11 +01:00 |
|
|
|
a67f9d50de
|
removed the allocating of memory for eiger and jungfrau to receive data via tcp from detector as this will not happen
|
2016-12-02 12:47:01 +01:00 |
|
|
|
dd9387ef29
|
using detid to calculte zmq port in case of shmget error and det id does not start with 0 and 1 as in receiver zmq server ports
|
2016-12-02 08:53:08 +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 |
|
|
|
0ed9ee0e5d
|
fixing the 32 bit crash and empty plot using zmq
|
2016-11-21 12:02:45 +01:00 |
|
