|
|
1af065fdb1
|
infinite loop with gettotalnumberofchannels in gappixels initialization resulting in bus error fix
|
2017-11-13 11:13:26 +01:00 |
|
|
|
678ef89e17
|
conflict resolved from merge developer to gappixels insignificant
|
2017-11-10 16:54:18 +01:00 |
|
|
|
3886a0c9ad
|
merge fix from 3.0.1 regarding gethostbyname thread safety
|
2017-11-10 16:37:20 +01:00 |
|
|
|
23ddb3d4b5
|
merge fix from 3.0.1 regarding gethostbyname thread safety
|
2017-11-10 16:34:31 +01:00 |
|
|
|
739187943d
|
replaced gethostbyname with getaddrinfo as it is not thread safe
|
2017-11-10 16:30:38 +01:00 |
|
|
|
82f503aa09
|
dynamic range also updates offsets, 4 bit mode gap pixels work in call back from gui
|
2017-10-31 12:50:31 +01:00 |
|
|
|
79bce5e006
|
4 bit mode works without gappixels
|
2017-10-26 16:01:18 +02:00 |
|
|
|
9c82a8f726
|
temp in between, trying to get 4 bitmode to work without gap pixels
|
2017-10-26 11:19:58 +02:00 |
|
|
|
7f9ac86862
|
Merge branch 'developer' into gappixels
|
2017-10-23 17:09:13 +02:00 |
|
|
|
d2fd0cbee9
|
x y and z coordinates are pushed into eiger server and its fixed in appropriate client side as well
|
2017-10-23 12:20:18 +02:00 |
|
|
|
812606a7b4
|
conflict resolution with developer
|
2017-10-03 15:12:49 +02:00 |
|
|
|
03a2f979a9
|
fixing merge conflict in error_Defs
|
2017-10-03 14:32:30 +02:00 |
|
|
|
96caf728c8
|
setting receiver to none properly, ten giga set in shared memoery properly if no receiver involved
|
2017-10-03 14:17:48 +02:00 |
|
|
|
bb817733ff
|
changes upto the receiver, not incl gui
|
2017-10-03 10:44:05 +02:00 |
|
|
|
352ade6457
|
just skeleton of gappixels
|
2017-09-27 17:08:00 +02: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 |
|
|
|
986826cbe9
|
x y z and id are written to the udp header for eiger
|
2017-09-26 16:39:02 +02:00 |
|
|
|
663fd557ff
|
client gives now 3d positions of detector to be configured in udp header, only in jungfrau firmware till now
|
2017-09-22 15:28:57 +02:00 |
|
|
|
ab27437604
|
removed setframeindexenable from going to the receiver, it can figure it out on its own now
|
2017-09-22 12:23:39 +02:00 |
|
|
|
092487c08e
|
Merge branch '3.0.1' into developer
|
2017-09-19 17:19:36 +02:00 |
|
|
|
3a79f0ad9b
|
parallelizing file name has its consequences, file name prefix edited only in multi level
|
2017-09-19 11:37:54 +02:00 |
|
|
|
90f899c936
|
replaced post incrementing by pre incrementing
|
2017-09-18 17:20:38 +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 |
|
|
|
c635b19941
|
fixed jungfrau image after programfpga, fixed resetfpga
|
2017-09-14 15:55:55 +02:00 |
|
|
|
49378e6d09
|
added streamsrcip command to be able to change the interface from which receiver streams data from
|
2017-09-12 14:33:11 +02:00 |
|
|
|
aef462da32
|
merge error fixed
|
2017-09-08 09:31:26 +02:00 |
|
|
|
1ba325e902
|
Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer
|
2017-09-07 11:27:52 +02:00 |
|
|
|
bdccddfe97
|
in between
|
2017-08-23 18:24:48 +02:00 |
|
|
|
a657bac1b1
|
removed a print
|
2017-08-23 18:01:02 +02:00 |
|
|
|
f4e2b819d2
|
changes for external gui
|
2017-08-23 16:31:32 +02:00 |
|
|
|
57537a350f
|
updating cmd line help; other detectors other than eiger will complain cannot set timer 14 (subexptime) when setting receiver
|
2017-08-16 17:12:23 +02:00 |
|
|
|
3aeb15648c
|
Anna's modifications
|
2017-08-11 15:55:07 +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 |
|
|
|
f084efd263
|
sending and writing subexptime in the receiver files, adding 0x in front of all numbers printed in command line which is hexa
|
2017-08-10 17:25:18 +02:00 |
|
|
|
e3667f6827
|
can set zmqport from receiver
|
2017-07-13 12:18:07 +02:00 |
|
|
|
f944d7cae4
|
made updatereceiver to actually update client in parameters that it can
|
2017-07-03 17:37:24 +02:00 |
|
|
|
99dad79572
|
Somewhere
|
2017-07-03 13:46:06 +02:00 |
|
|
|
da4ffb235c
|
ensuring set detector type is the first call
|
2017-07-03 13:32:10 +02:00 |
|
|
|
b05e9c194a
|
makefiles and versioning update complete
|
2017-06-29 17:10:10 +02:00 |
|
|
|
c2624daa9a
|
uncommented a print
|
2017-06-28 10:27:40 +02:00 |
|
|
|
c2980b3c44
|
changes for setting threshold without trimbits for eiger
|
2017-06-28 10:24:07 +02:00 |
|
|
|
ffd3cb6511
|
Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer
|
2017-06-26 13:03:08 +02:00 |
|
|
|
dfb8a1f7ad
|
small modifications for jctb and moench03 module
|
2017-06-26 13:03:01 +02:00 |
|
|
|
fe73e09aa4
|
removing unnecessary printouts, ensuring lost packets are 0xff
|
2017-06-21 17:05:47 +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 |
|
|
|
132a9bbfe9
|
solved many bugs, but cannot get data in eiger
|
2017-06-09 16:02:58 +02:00 |
|
|
|
c755a8974c
|
done, but need to compile
|
2017-06-09 11:42:25 +02:00 |
|
|
|
0722ef3125
|
changes including warnings and zmq
|
2017-05-04 17:52:47 +02:00 |
|
