|
|
e3667f6827
|
can set zmqport from receiver
|
2017-07-13 12:18:07 +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 |
|
|
|
c2980b3c44
|
changes for setting threshold without trimbits for eiger
|
2017-06-28 10:24:07 +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 |
|
|
|
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 |
|
|
|
cbbdd8eeab
|
Merged to developer
|
2017-06-13 15:30:33 +02:00 |
|
|
|
8caab4e562
|
Modicfications for chiptestboard and moench03 module
|
2017-06-13 15:28:45 +02:00 |
|
|
|
cb7b8713cf
|
fixed the precision problem in converting double to long long int (0.0000325 *1E9), cant find another example
|
2017-06-13 12:58:56 +02:00 |
|
|
|
0722ef3125
|
changes including warnings and zmq
|
2017-05-04 17:52:47 +02:00 |
|
|
|
445da80df8
|
resolved warnings, also from esrf: todo: include changes in zmq
|
2017-05-01 13:11:10 +02:00 |
|
|
|
911ff49238
|
changes for merges from 2.3 incl standard packet header
|
2017-03-20 11:22:07 +01:00 |
|
|
|
ecaa8e45a4
|
some changes to the command help
|
2017-03-15 14:52:19 +01:00 |
|
|
|
7e00d9f395
|
Merge branch 'developer' into hdf5
|
2017-03-03 10:06:34 +01:00 |
|
|
|
f12df80c5b
|
some changes for chiptest board and mythen server now compiles
|
2017-02-23 12:05:34 +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 |
|
|
|
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 |
|
|
|
c70f453de4
|
changed everything to depend on receiver online shared memory flag, and if it is online is only checked rarely
|
2016-11-22 14:01:07 +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 |
|
|
|
dec82ab850
|
included datastream command earlier but not working yet
|
2016-11-08 15:21:56 +01:00 |
|
|
|
8aea36b4ef
|
fixed jungfrau configure bug by getting rid of gb10reset at configure
|
2016-11-08 09:35:34 +01:00 |
|
|
|
4b99ff7fbe
|
reset fpga implemented, changed receiver configuration warning prints, powerchip implemented
|
2016-11-03 12:31:34 +01:00 |
|
|
|
12574f4c05
|
merged zmqdata to developer
|
2016-10-20 08:46:48 +02:00 |
|
|
|
81d96a047d
|
slsDetector/slsDetectorCommand.cpp
|
2016-10-20 07:31:53 +02:00 |
|
|
|
28f96f4b51
|
included a febl and febr temp read
|
2016-10-07 15:44:13 +02:00 |
|
|
|
d54392c6eb
|
increased delay to get framescaught from receiver for acquire form command line
|
2016-10-07 12:45:34 +02:00 |
|
|
|
5f4a4b0d90
|
maybe fixed 16 bit rate corr eiger
|
2016-09-23 17:15:16 +02:00 |
|
|
|
988426dc96
|
Added adc command for chiptestboard
|
2016-09-05 10:49:47 +02:00 |
|
|
|
c6c11f6740
|
Added v_a command for chiptestboard
|
2016-08-22 14:32:42 +02:00 |
|
|
|
b90ca7b864
|
Added DACs for ne chiptestboard; fixed problem on dac14/highvoltage for moench
|
2016-08-16 15:15:24 +02:00 |
|
|
|
1f9dc775f6
|
ensure receiver is updated when detector timer values are updated (force_update)
|
2016-08-12 17:44:28 +02:00 |
|
|
|
29ba1f4042
|
changed transmission delay commands to go through network parameters and included 10g flow control
|
2016-08-04 17:21:16 +02:00 |
|
|
|
d28d737fb9
|
transmission delay added
|
2016-08-03 17:03:37 +02:00 |
|
|
|
c0db1a89a8
|
deactivate for eiger
|
2016-08-02 10:32:37 +02:00 |
|
|
|
ee26339fd7
|
added more accurate temperature sensors for eiger, and to gui
|
2016-07-22 10:40:58 +02:00 |
|
|
|
5af05c24c1
|
added iodelay with setttings
|
2016-02-24 18:05:17 +01:00 |
|
|
|
5d3c427f11
|
changed setctrbit command to resmat
|
2016-02-11 10:48:58 +01:00 |
|
|
|
1e3f9e8ead
|
fixed receiver toalso get frames*cycles as number of frames
|
2016-02-10 17:03:10 +01:00 |
|
|
|
9067da5e88
|
rate correction for eiger implemented
|
2016-02-10 11:22:59 +01:00 |
|
|
|
6cc22a350d
|
Merge branch 'release' into jungfrauv1.0
|
2016-02-03 15:05:50 +01:00 |
|
|
|
f477b7a5ac
|
not much changes
|
2016-01-19 16:25:48 +01:00 |
|
|
|
a785eb7d5e
|
newline after wrong command
|
2016-01-08 17:18:50 +01:00 |
|
|
|
5012ea0c6c
|
unnecessary lock in acquire
|
2015-11-24 13:50:42 +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 |
|
