 Dhanya Maliakal
|
0b45d73e0c
|
Merge branch '3.0.1' into developer
|
2017-11-22 18:02:45 +01:00 |
|
|
Dhanya Maliakal
|
7860637b46
|
switching off data streaming from command line only in receiver start and not in receiver as a whoel put command
|
2017-11-22 18:02:36 +01:00 |
|
|
Dhanya Maliakal
|
db6947cc9c
|
Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer
|
2017-11-22 15:08:33 +01:00 |
|
|
Dhanya Maliakal
|
590fac9e07
|
making nx and ny available for jctb in call back
|
2017-11-22 15:08:09 +01:00 |
|
 bergamaschi
|
400585be6a
|
Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer
|
2017-11-22 12:34:28 +01:00 |
|
|
bergamaschi
|
dcfa6fb100
|
Fixed filename problem with CPU readout and trimval command for mythen
|
2017-11-22 12:34:14 +01:00 |
|
|
Dhanya Maliakal
|
2067f47f34
|
Merge branch '3.0.1' into developer
|
2017-11-21 14:15:59 +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
|
7dee07b9c5
|
somewhere
|
2017-11-16 09:12:54 +01:00 |
|
|
Dhanya Maliakal
|
2b0d07387a
|
in between separating datastreaming in client and receiver
|
2017-11-15 17:16:47 +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
|
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
|
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
|
79bce5e006
|
4 bit mode works without gappixels
|
2017-10-26 16:01:18 +02:00 |
|
|
Dhanya Maliakal
|
9c82a8f726
|
temp in between, trying to get 4 bitmode to work without gap pixels
|
2017-10-26 11:19:58 +02:00 |
|
|
Dhanya Maliakal
|
7f9ac86862
|
Merge branch 'developer' into gappixels
|
2017-10-23 17:09:13 +02:00 |
|
|
Dhanya Maliakal
|
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 |
|
 maliakal_d
|
4f2af046d3
|
Merge branch 'developer' into gappixels
|
2017-10-12 14:58:41 +02:00 |
|
|
maliakal_d
|
311059d748
|
merge fix from 3.0.1 which includes server without crash, multi settimer -1 bug, need to recompile eiger server for this branch
|
2017-10-12 14:42:57 +02:00 |
|
|
maliakal_d
|
a59309b13f
|
minor bug fix if same client: client ip only 8 bytes instead of 16 bytes copied, added user class functionality for long term use:stopacquisition
|
2017-10-12 10:18:15 +02:00 |
|
|
Dhanya Maliakal
|
812606a7b4
|
conflict resolution with developer
|
2017-10-03 15:12:49 +02:00 |
|
|
Dhanya Maliakal
|
03a2f979a9
|
fixing merge conflict in error_Defs
|
2017-10-03 14:32:30 +02:00 |
|
|
Dhanya Maliakal
|
2aed12dcb9
|
updaterev
|
2017-10-03 14:18:33 +02:00 |
|
|
Dhanya Maliakal
|
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 |
|
|
Dhanya Maliakal
|
bb817733ff
|
changes upto the receiver, not incl gui
|
2017-10-03 10:44:05 +02:00 |
|