|
|
49ba893d7e
|
zmq buffering when acquire form command line, stopping sockets when command line acquire or receiver start, restarting sockets at change of port numbers and a refresh button for the same
|
2017-11-21 13:38:31 +01:00 |
|
|
|
46aeee00f1
|
somewhere
|
2017-11-21 12:30:58 +01:00 |
|
|
|
5f0575236e
|
Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer
|
2017-11-21 12:10:33 +01:00 |
|
|
|
45e0cf71eb
|
put trimval should work also for MYTHEN
|
2017-11-21 12:09:52 +01:00 |
|
|
|
bd228fac27
|
bug fix in cleanup code, indexing
|
2017-11-20 17:19:03 +01:00 |
|
|
|
b7ca7f5319
|
just cleanuped code
|
2017-11-20 17:15:13 +01:00 |
|
|
|
11c9ab16f9
|
Merge branch '3.0.1' into developer
|
2017-11-20 16:44:21 +01:00 |
|
|
|
d1d530f0e7
|
manual
|
2017-11-20 16:43:39 +01:00 |
|
|
|
e6d22a97e2
|
Merge branch '3.0.1' into developer
|
2017-11-20 15:14:13 +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 |
|
|
|
99037449f4
|
in between moench stuff
|
2017-11-20 14:23:32 +01:00 |
|
|
|
97260510f2
|
gap pixels should be allowed to set to 0 for other detectors
|
2017-11-20 09:43:41 +01:00 |
|
|
|
662f502d4c
|
zmq always needs an ip in header
|
2017-11-17 17:40:57 +01:00 |
|
|
|
c5c23e73d5
|
works zmq separated for client and rx, ports and ip included in expert advanced mode
|
2017-11-17 17:39:04 +01:00 |
|
|
|
70e4c6e2a2
|
zmq separated for client and rx, ports and ip included in expert advanced mode
|
2017-11-17 17:37:00 +01:00 |
|
|
|
23b415d837
|
streaming port set return same as get simple change
|
2017-11-17 14:04:03 +01:00 |
|
|
|
428855d801
|
in between
|
2017-11-17 14:02:00 +01:00 |
|
|
|
2e234f1bbd
|
Merge branch '3.0.1' into developer
|
2017-11-17 11:36:02 +01:00 |
|
|
|
a79864a5ae
|
bugfix enabledata streaming send int for update
|
2017-11-17 11:35:54 +01:00 |
|
|
|
1dee950870
|
merge conflict from 3.0.1
|
2017-11-17 11:35:15 +01:00 |
|
|
|
51499fa503
|
merge conflict from 3.0.1
|
2017-11-17 11:35:02 +01:00 |
|
|
|
dcf4d98a75
|
show warnings, update binaries conflict from merge
|
2017-11-17 11:33:52 +01:00 |
|
|
|
28e2ebf75a
|
merge conflict resolved from 3.0.1
|
2017-11-17 09:40:42 +01:00 |
|
|
|
823d537825
|
fixed warnings
|
2017-11-17 09:26:20 +01:00 |
|
|
|
d7137e0c75
|
fixed segmentation fault issue of xputsn the right way, fixed warnings
|
2017-11-17 09:26:05 +01:00 |
|
|
|
2569ffbf10
|
fixed warnings, back to int warning in debugstream due to 64 bit
|
2017-11-17 08:53:05 +01:00 |
|
|
|
b020270734
|
edited cmake to show warnings
|
2017-11-17 08:46:59 +01:00 |
|
|
|
f647bdaa48
|
updated users class to reflect zmq changes (separation), fixed warnings
|
2017-11-17 08:46:43 +01:00 |
|
|
|
c1e735c1b4
|
fixed a few warnings
|
2017-11-17 08:46:04 +01:00 |
|
|
|
4097c37b31
|
in between
|
2017-11-16 16:01:31 +01:00 |
|
|
|
a89265faf8
|
Merge branch '3.0.1' into zmqseparate
|
2017-11-16 15:09:14 +01:00 |
|
|
|
8e0414d1b9
|
separating zmqport, enabling in client and receiver works
|
2017-11-16 15:01:22 +01:00 |
|
|
|
bbcf75bc09
|
separating zmqport, enabling in client and receiver works
|
2017-11-16 15:00:59 +01:00 |
|
|
|
065b4a8e0f
|
including zmq port change in gui
|
2017-11-16 13:50:30 +01:00 |
|
|
|
2fca426ec0
|
Merge branch '3.0' into zmqseparate
|
2017-11-16 13:49:11 +01:00 |
|
|
|
bf89dd44f3
|
updated binaries
|
2017-11-16 12:34:12 +01:00 |
|
|
|
d9fcac0236
|
updated merge from 3.0 hotfix setdac
|
2017-11-16 12:32:38 +01:00 |
|
|
|
875ca44c0b
|
updated server hotfix binary
|
2017-11-16 12:30:41 +01:00 |
|
|
|
4c9cc1b477
|
Merge branch '3.0' into 3.0.1
|
2017-11-16 12:29:34 +01:00 |
|
|
|
f340eef4bc
|
updated server hotfix binary
|
2017-11-16 12:29:09 +01:00 |
|
|
|
f192164e32
|
fixed setdac bug that comes rarely, moved serialize spi to 32bit
|
2017-11-16 12:27:58 +01:00 |
|
|
|
c69ae52e76
|
somewhere
|
2017-11-16 09:12:57 +01:00 |
|
|
|
7dee07b9c5
|
somewhere
|
2017-11-16 09:12:54 +01:00 |
|
|
|
0e8d2de253
|
somewhere
|
2017-11-16 09:12:49 +01:00 |
|
|
|
fd34bab34b
|
in between separating datastreaming in client and receiver
|
2017-11-15 17:19:07 +01:00 |
|
|
|
2b0d07387a
|
in between separating datastreaming in client and receiver
|
2017-11-15 17:16:47 +01:00 |
|
|
|
eb4ab306c7
|
in between separating datastreaming in client and receiver
|
2017-11-15 17:16:37 +01:00 |
|
|
|
32d32dbcdc
|
in between separating datastreaming in client and receiver
|
2017-11-15 16:16:59 +01:00 |
|
|
|
7f256c868b
|
fixed bug for 1D detector in slsDetectorData
|
2017-11-15 14:39:35 +01:00 |
|
|
|
06b9efd229
|
modifications for on the fly analysis working at cSAXS
|
2017-11-15 12:23:21 +01:00 |
|
