Dhanya Maliakal
|
9f91b78696
|
update comments
|
2017-11-28 09:26:12 +01:00 |
|
Dhanya Maliakal
|
d1eab6f750
|
updated slsdetector users for zmqport set up
|
2017-11-28 09:24:40 +01:00 |
|
Dhanya Maliakal
|
c0a114345b
|
bug fix set error mask when setting wrong settings
|
2017-11-27 16:11:33 +01:00 |
|
Dhanya Maliakal
|
386ef7766c
|
zmq streaming should work with external gui now
|
2017-11-27 16:01:12 +01:00 |
|
Dhanya Maliakal
|
65d7922286
|
merge solved
|
2017-11-23 18:24:24 +01:00 |
|
Dhanya Maliakal
|
16e4fbf8dd
|
receiver read freq should save value in shm even if no receiver present
|
2017-11-23 18:21:54 +01:00 |
|
Dhanya Maliakal
|
5eb8402742
|
bugfix zmq streaming both on
|
2017-11-23 17:28:35 +01:00 |
|
Dhanya Maliakal
|
dc5384f0f9
|
copy zmq port even if receiver not online, else it is lost
|
2017-11-23 17:20:07 +01:00 |
|
Dhanya Maliakal
|
20dc338c90
|
when changing network parameter, switch off data streaming only if on
|
2017-11-23 17:00:12 +01:00 |
|
Dhanya Maliakal
|
8538604c0f
|
somewhere
|
2017-11-23 14:53:37 +01:00 |
|
Dhanya Maliakal
|
856ad76247
|
included setreceiver online in users class, so that one can start using users without config file
|
2017-11-23 10:21:54 +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
|
6753f8ba6c
|
network parameter should return with extra plus at the end like hostname
|
2017-11-22 17:06:43 +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 |
|
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
|
23b415d837
|
streaming port set return same as get simple change
|
2017-11-17 14:04:03 +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
|
a89265faf8
|
Merge branch '3.0.1' into zmqseparate
|
2017-11-16 15:09:14 +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
|
4c9cc1b477
|
Merge branch '3.0' into 3.0.1
|
2017-11-16 12:29:34 +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
|
6d6133be59
|
Merge branch '3.0' into zmqseparate
|
2017-11-15 10:34:30 +01:00 |
|
Dhanya Maliakal
|
fee95d228e
|
Merge branch '3.0' into 3.0.1
|
2017-11-15 09:29:05 +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
|
4903164f95
|
added high voltage to users class
|
2017-11-14 10:58:54 +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
|
7e0af1cc7c
|
bugfix: users rate correction able to set for eiger
|
2017-11-14 09:08:08 +01:00 |
|
Dhanya Maliakal
|
70848c9891
|
bugfix ratecorr always gave back -100
|
2017-11-13 13:39:28 +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
|
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
|
1420921291
|
Merge branch '3.0' into 3.0.1
|
2017-10-27 15:47:15 +02:00 |
|
Dhanya Maliakal
|
045a7cfcb1
|
removed settings bug, highvoltage returning 60 when switched off
|
2017-10-27 15:38:07 +02:00 |
|
Dhanya Maliakal
|
92f988ddc1
|
somewhere
|
2017-10-27 14:00:57 +02:00 |
|
Dhanya Maliakal
|
fe6e1c8868
|
new eiger server binary with status fixed
|
2017-10-12 11:48:43 +02:00 |
|
Dhanya Maliakal
|
eb78ae0fe1
|
new eiger server binary with status fixed
|
2017-10-12 11:44:46 +02:00 |
|
|
|
8585a536ec
|
fixed eiger server status problem, updating binary in next commit
|
2017-10-12 11:42:37 +02:00 |
|
|
|
338fb2af35
|
in betwee, fixed eiger server error
|
2017-10-12 11:38:26 +02:00 |
|
|
|
a6e520d969
|
in between stage: error in compiling eiger server with error status: include file
|
2017-10-12 11:35:31 +02:00 |
|
|
|
eb32335194
|
trying changes to server for error
|
2017-10-12 10:51:47 +02:00 |
|
|
|
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 |
|
|
|
f2f061ae18
|
bug fix: using int instead of int64_t , eg exptime is -1 on return
|
2017-10-12 09:47:13 +02:00 |
|
