 Dhanya Maliakal
|
2067f47f34
|
Merge branch '3.0.1' into developer
|
2017-11-21 14:15:59 +01:00 |
|
|
Dhanya Maliakal
|
167a6cff3e
|
restart streaming if port changed in multi level, sls detector level:need to take care of it on your own
|
2017-11-21 13:42:11 +01:00 |
|
|
Dhanya Maliakal
|
2cc11f1ff0
|
bug fix: enabledatastreaming get should return shared memory variable and not from receiver, bug fix: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:39:12 +01:00 |
|
 bergamaschi
|
5f0575236e
|
Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer
|
2017-11-21 12:10:33 +01:00 |
|
|
bergamaschi
|
45e0cf71eb
|
put trimval should work also for MYTHEN
|
2017-11-21 12:09:52 +01:00 |
|
|
Dhanya Maliakal
|
bd228fac27
|
bug fix in cleanup code, indexing
|
2017-11-20 17:19:03 +01:00 |
|
|
Dhanya Maliakal
|
b7ca7f5319
|
just cleanuped code
|
2017-11-20 17:15:13 +01:00 |
|
|
Dhanya Maliakal
|
e6d22a97e2
|
Merge branch '3.0.1' into developer
|
2017-11-20 15:14:13 +01:00 |
|
|
Dhanya Maliakal
|
a0c014eb7d
|
changed rate correction back to what it was before in users class, enabling sets defaults
|
2017-11-20 15:14:01 +01:00 |
|
|
Dhanya Maliakal
|
99037449f4
|
in between moench stuff
|
2017-11-20 14:23:32 +01:00 |
|
|
Dhanya Maliakal
|
c5c23e73d5
|
works zmq separated for client and rx, ports and ip included in expert advanced mode
|
2017-11-17 17:39:04 +01:00 |
|
|
Dhanya Maliakal
|
23b415d837
|
streaming port set return same as get simple change
|
2017-11-17 14:04:03 +01:00 |
|
|
Dhanya Maliakal
|
428855d801
|
in between
|
2017-11-17 14:02:00 +01:00 |
|
|
Dhanya Maliakal
|
51499fa503
|
merge conflict from 3.0.1
|
2017-11-17 11:35:02 +01:00 |
|
|
Dhanya Maliakal
|
f647bdaa48
|
updated users class to reflect zmq changes (separation), fixed warnings
|
2017-11-17 08:46:43 +01:00 |
|
|
Dhanya Maliakal
|
4097c37b31
|
in between
|
2017-11-16 16:01:31 +01:00 |
|
|
Dhanya Maliakal
|
8e0414d1b9
|
separating zmqport, enabling in client and receiver works
|
2017-11-16 15:01:22 +01:00 |
|
|
Dhanya Maliakal
|
2fca426ec0
|
Merge branch '3.0' into zmqseparate
|
2017-11-16 13:49:11 +01:00 |
|
|
Dhanya Maliakal
|
d9fcac0236
|
updated merge from 3.0 hotfix setdac
|
2017-11-16 12:32:38 +01:00 |
|
|
Dhanya Maliakal
|
f192164e32
|
fixed setdac bug that comes rarely, moved serialize spi to 32bit
|
2017-11-16 12:27:58 +01:00 |
|
|
Dhanya Maliakal
|
7dee07b9c5
|
somewhere
|
2017-11-16 09:12:54 +01:00 |
|
|
Dhanya Maliakal
|
fd34bab34b
|
in between separating datastreaming in client and receiver
|
2017-11-15 17:19:07 +01:00 |
|
|
Dhanya Maliakal
|
2b0d07387a
|
in between separating datastreaming in client and receiver
|
2017-11-15 17:16:47 +01:00 |
|
|
Dhanya Maliakal
|
7c9958db04
|
updated binary merge from 3.0 regarding settings
|
2017-11-15 10:36:55 +01:00 |
|
|
Dhanya Maliakal
|
956625bb50
|
Merge branch '3.0' into developer
|
2017-11-15 10:35:20 +01:00 |
|
|
Dhanya Maliakal
|
6d6133be59
|
Merge branch '3.0' into zmqseparate
|
2017-11-15 10:34:30 +01:00 |
|
|
Dhanya Maliakal
|
dd1cf42a73
|
proper fix for settings, including dacs
|
2017-11-14 17:51:13 +01:00 |
|
|
Dhanya Maliakal
|
dda86cfe9b
|
somewhere in separating zmq rxr and client
|
2017-11-14 16:26:17 +01:00 |
|
|
Dhanya Maliakal
|
6693d08331
|
fixed help of acquire doing an actual acquisition
|
2017-11-14 11:53:37 +01:00 |
|
|
Dhanya Maliakal
|
cf4498cf78
|
Merge branch '3.0.1' into developer
|
2017-11-14 10:59:01 +01:00 |
|
|
Dhanya Maliakal
|
4903164f95
|
added high voltage to users class
|
2017-11-14 10:58:54 +01:00 |
|
|
Dhanya Maliakal
|
c127eebeaa
|
Merge branch '3.0.1' into developer
|
2017-11-14 09:13:39 +01:00 |
|
|
Dhanya Maliakal
|
ef257d12e7
|
prev bug fix of ratecorr for eiger from users, made simpler
|
2017-11-14 09:13:32 +01:00 |
|
|
Dhanya Maliakal
|
363aa9124e
|
Merge branch '3.0.1' into developer
|
2017-11-14 09:08:16 +01:00 |
|
|
Dhanya Maliakal
|
7e0af1cc7c
|
bugfix: users rate correction able to set for eiger
|
2017-11-14 09:08:08 +01:00 |
|
|
Dhanya Maliakal
|
4c4a26c0e3
|
Merge branch '3.0.1' into developer
|
2017-11-13 13:39:39 +01:00 |
|
|
Dhanya Maliakal
|
70848c9891
|
bugfix ratecorr always gave back -100
|
2017-11-13 13:39:28 +01:00 |
|
|
Dhanya Maliakal
|
1af065fdb1
|
infinite loop with gettotalnumberofchannels in gappixels initialization resulting in bus error fix
|
2017-11-13 11:13:26 +01:00 |
|
|
Dhanya Maliakal
|
678ef89e17
|
conflict resolved from merge developer to gappixels insignificant
|
2017-11-10 16:54:18 +01:00 |
|
|
Dhanya Maliakal
|
3886a0c9ad
|
merge fix from 3.0.1 regarding gethostbyname thread safety
|
2017-11-10 16:37:20 +01:00 |
|
|
Dhanya Maliakal
|
23ddb3d4b5
|
merge fix from 3.0.1 regarding gethostbyname thread safety
|
2017-11-10 16:34:31 +01:00 |
|
|
Dhanya Maliakal
|
739187943d
|
replaced gethostbyname with getaddrinfo as it is not thread safe
|
2017-11-10 16:30:38 +01:00 |
|
|
Dhanya Maliakal
|
a2210c0118
|
Merge branch '3.0.1' into gappixels
|
2017-11-09 14:08:04 +01:00 |
|
|
Dhanya Maliakal
|
6d0f751104
|
Merge branch '3.0.1' into developer
|
2017-11-09 14:07:48 +01:00 |
|
|
Dhanya Maliakal
|
fb0afc282d
|
gotthard server, too fast now sets stopped bit high and stops acquisition, so polling status also made aware of stopped bit
|
2017-11-09 14:01:36 +01:00 |
|
|
Dhanya Maliakal
|
d24ab31d87
|
gotthard fix
|
2017-11-09 13:44:38 +01:00 |
|
|
Dhanya Maliakal
|
3c6d572369
|
including dynamic range in gui call back
|
2017-11-02 11:02:40 +01:00 |
|
|
Dhanya Maliakal
|
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 |
|
|
Dhanya Maliakal
|
6ff249c3f2
|
Merge branch 'developer' into gappixels
|
2017-10-27 16:18:52 +02:00 |
|
|
Dhanya Maliakal
|
b75dde4613
|
merge bug fix of set module
|
2017-10-27 16:17:12 +02:00 |
|