3432 Commits

Author SHA1 Message Date
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
375b1c9485 not required to restart client datastreaming due to connect everytime for acquire 2017-11-27 15:40:36 +01:00
Dhanya Maliakal
65d7922286 merge solved 2017-11-23 18:24:24 +01:00
Dhanya Maliakal
eb89e9bf96 Merge branch '3.0.1' into zmqchange 2017-11-23 18:22:27 +01:00
Dhanya Maliakal
9f733c1dfb Merge branch '3.0.1' into zmqchange 2017-11-23 18:22:26 +01:00
Dhanya Maliakal
59b5fe9424 receiver read freq should save value in shm even if no receiver present 2017-11-23 18:22:03 +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
d40a2e0efa receiver read freq should save value in shm even if no receiver present 2017-11-23 18:21:29 +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
b14ea217ee Merge branch '3.0.1' into zmqchange 2017-11-23 16:34:14 +01:00
Dhanya Maliakal
da3ca9f306 changes to use ZmqSocket.h externally without further changes 2017-11-23 16:28:02 +01:00
Dhanya Maliakal
ad64df01c7 somewhere 2017-11-23 14:53:40 +01:00
Dhanya Maliakal
8538604c0f somewhere 2017-11-23 14:53:37 +01:00
Dhanya Maliakal
d23c9d52ed somewhere 2017-11-23 14:53:33 +01:00
Dhanya Maliakal
3b292bdeb6 need to enable data streaming for client 2017-11-23 10:27:59 +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
4749e8c4e4 modified users client to work without config and better print out 2017-11-23 09:34:12 +01:00
Dhanya Maliakal
447451231c modified users client to work without config and better print out 2017-11-22 18:09:16 +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
ea3c722552 made a bin in manual api to be able to compile here 2017-11-22 17:47:16 +01:00
Dhanya Maliakal
4ecbfada5b Merge branch '3.0.1' of git.psi.ch:sls_detectors_software/sls_detectors_package into 3.0.1 2017-11-22 17:43:12 +01:00
Dhanya Maliakal
d47abb140f removed detreceivernocall 2017-11-22 17:43:00 +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
8c45f94496 updated npixelsy for jungfrau effecting hdf5 mapping 2017-11-21 15:46:10 +01:00
Gemma Tinti
e023cb186f manual 2017-11-21 15:34:56 +01:00
Dhanya Maliakal
fd4dd5b1e9 removed printout 2017-11-21 15:12:05 +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
d00df32e49 changing zmq rxr port should restart data streaming 2017-11-21 13:39:49 +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
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
Gemma Tinti
d1d530f0e7 manual 2017-11-20 16:43:39 +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
a79864a5ae bugfix enabledata streaming send int for update 2017-11-17 11:35:54 +01:00
Dhanya Maliakal
823d537825 fixed warnings 2017-11-17 09:26:20 +01:00
Dhanya Maliakal
d7137e0c75 fixed segmentation fault issue of xputsn the right way, fixed warnings 2017-11-17 09:26:05 +01:00
Dhanya Maliakal
2569ffbf10 fixed warnings, back to int warning in debugstream due to 64 bit 2017-11-17 08:53:05 +01:00
Dhanya Maliakal
b020270734 edited cmake to show warnings 2017-11-17 08:46:59 +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
c1e735c1b4 fixed a few warnings 2017-11-17 08:46:04 +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
bbcf75bc09 separating zmqport, enabling in client and receiver works 2017-11-16 15:00:59 +01:00
Dhanya Maliakal
065b4a8e0f including zmq port change in gui 2017-11-16 13:50:30 +01:00
Dhanya Maliakal
2fca426ec0 Merge branch '3.0' into zmqseparate 2017-11-16 13:49:11 +01:00