57 Commits

Author SHA1 Message Date
a74e8f68f7 size change in receiver call back API now streamed, gui allows smaller packet size than expected to be caught and replaced the rest with 0xFF 2018-03-21 17:08:38 +01:00
Dhanya Maliakal
0ef52138e1 merge conflict sorted, removing rest 2017-12-05 11:25:10 +01:00
Dhanya Maliakal
65b4c69847 REST implementation removed from slsReceiver 2017-12-05 11:03:52 +01:00
Dhanya Maliakal
6f3898441e merge conflict from 3.0.1 to restream stop from recieveR 2017-11-30 19:05:47 +01:00
Dhanya Maliakal
70bf6eb4cb restream stop from receiver 2017-11-30 18:39:08 +01:00
Dhanya Maliakal
e54767b69d conflict resolution with developer 2017-10-03 15:12:56 +02:00
Dhanya Maliakal
0b82aabd2b merge with 3.0.1 conflicts resolved 2017-10-03 14:52:53 +02:00
Dhanya Maliakal
7cde5dbe38 changes upto the receiver, not incl gui 2017-10-03 10:44:08 +02:00
Dhanya Maliakal
6a8aad4c2b added silent mode in receiver during real time acquisition, doesnt print packet loss regularly or file name created each time 2017-09-27 10:11:31 +02:00
Dhanya Maliakal
e8bb186ff8 removed setframeindexenable from being set by client, redundant. removed read_frame from list of functions, obsolete. 2017-09-22 12:25:08 +02:00
Dhanya Maliakal
5ff574b33f made default streamer to be the ip related to hostname, otherwise can be specified from the client, also made it compatible with chip test board detector now 2017-09-12 15:04:56 +02:00
Dhanya Maliakal
ad3e3ce255 sending and writing subexptime in the receiver files, adding 0x in front of all numbers printed in command line which is hexa 2017-08-10 17:25:28 +02:00
Dhanya Maliakal
0bacb903ea rest implementation, index issues 2017-07-13 14:44:03 +02:00
Dhanya Maliakal
39560969f4 can set zmqport from receiver, ensured proper destructors, and ctrl c should kill it 2017-07-13 12:17:49 +02:00
Dhanya Maliakal
a11313fe96 removed copies 2017-03-24 15:15:30 +01:00
Dhanya Maliakal
86490226ed removing the return value usage in start acquisition callback, callbacks will be called if registered, and we will write files if file write enabled 2017-03-24 13:41:56 +01:00
Dhanya Maliakal
bb52676f50 merged from 2.3 without udpstandard 2017-03-24 10:34:31 +01:00
Dhanya Maliakal
404be013a2 changes to new callback arguments without filepointer 2017-03-23 14:08:43 +01:00
Dhanya Maliakal
b9eb3d5a52 somewere stuck with virtual template overloading 2017-03-23 11:56:17 +01:00
Dhanya Maliakal
9f68fc6f3b fixed call backs with new standard header 2017-03-15 15:00:25 +01:00
Dhanya Maliakal
53be854efd including subframe number 2017-03-13 11:33:06 +01:00
Dhanya Maliakal
936dfea8a7 works so far, no gui yet 2017-02-22 12:01:00 +01:00
Dhanya Maliakal
9e21583331 virtual, master all works, still to do rewriting file in an acquisition 2017-02-21 15:13:59 +01:00
Dhanya Maliakal
d95aaa2089 somewhere in between.. next step include generalData pointer in listerner and dataprocessor calss in constructor and a setter 2017-01-31 08:42:16 +01:00
Dhanya Maliakal
01d54a7a4c Complete rewrite of receiver, with new changes 2017-01-27 15:40:36 +01:00
Dhanya Maliakal
d847a289a4 changed progress prints, file naming etc 2016-12-21 10:53:56 +01:00
Dhanya Maliakal
d3200dc76f moving towards c++ api 2016-12-12 14:24:24 +01:00
Dhanya Maliakal
09645cbba8 bottom is defined as flippeddatax in config file, not anymore as argument for receiver 2016-11-30 10:36:46 +01:00
Dhanya Maliakal
e6c7dfc440 adding exptime to receiver for file header 2016-11-14 11:57:34 +01:00
Dhanya Maliakal
acb900961a fixed time interval in receiveR 2016-11-10 14:37:26 +01:00
Dhanya Maliakal
0cd9261332 merge fix 2016-10-20 09:17:42 +02:00
Dhanya Maliakal
266506e67f merged with zmqdata 2016-10-20 08:54:29 +02:00
Dhanya Maliakal
489b623afd trying to get in changes for activate in receiver 2016-10-05 08:24:35 +02:00
Dhanya Maliakal
2a4bd8022e works for deactivated server and receiver 2016-10-04 07:36:00 +02:00
Dhanya Maliakal
9c8f663b8e done 2016-09-16 12:49:39 +02:00
Dhanya Maliakal
a3369a7d21 separated 2016-08-31 17:23:44 +02:00
Dhanya Maliakal
f17a2ba2b8 in between 2016-08-24 11:54:15 +02:00
Dhanya Maliakal
0a2a88e23f in between 2016-08-17 09:33:59 +02:00
Dhanya Maliakal
18eb1274c5 fixed fifodepth to return defualt size, also moved destroying and creating threads to fifostructure, had forgotten to override setnumberofframes calling fifostructure which is important for gotthard 2015-12-15 11:04:49 +01:00
Dhanya Maliakal
0d86439589 some cleanup for rest 2015-11-23 11:54:55 +01:00
Dhanya Maliakal
777f04331d implemented fifo depth configurable from client 2015-11-17 10:31:09 +01:00
l_msdetect
58bfa296be done 2015-10-28 17:40:55 +01:00
Dhanya Maliakal
5ac37c2154 some more 2015-10-13 15:22:30 +02:00
Dhanya Maliakal
e915245c10 additional change 2015-10-08 17:09:43 +02:00
Dhanya Maliakal
a3e88f96d6 some more changes 2015-10-08 12:19:07 +02:00
Dhanya Maliakal
c392348def big change half done 2015-09-30 11:40:39 +02:00
Dhanya Maliakal
7c0430572b included subframe into receiver and sends to gui 2015-09-22 16:21:41 +02:00
Dhanya Maliakal
c840305189 starting receiver only at set detector type works 2015-05-21 17:39:17 +02:00
Dhanya Maliakal
89ad2112c6 difference between acquisition index and frame index 2015-03-12 12:25:23 +01:00
f36d742cd3 Merge branch 'eiger_receiver' of gitorious.psi.ch:sls_det_software/sls_receiver_software into eiger_receiver 2014-11-17 15:52:43 +01:00