Commit Graph

21 Commits

Author SHA1 Message Date
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 db2fef5d69 conflict resolved in merge from 3.0.1 to include file index in zmq streaming 2017-11-14 12:14:26 +01:00
Dhanya Maliakal 0ae706d9a5 file index sent along with zmq stream 2017-11-14 12:13:06 +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 4669d408d4 somewhere in between 2017-10-03 12:09:31 +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 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 77d688e508 changes done 2017-08-14 13:33:11 +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 49b4ae2f56 changed zmq method, and resolved warnings and from esrf 2017-05-03 17:57:56 +02:00
Dhanya Maliakal b9eb3d5a52 somewere stuck with virtual template overloading 2017-03-23 11:56:17 +01:00
Dhanya Maliakal 1e94ec0c6a fixed short gotthard 2017-03-09 13:28:03 +01:00
Dhanya Maliakal 537260879a created virtual datasets for bunchid and subframenumber 2017-03-02 11:43:11 +01:00
Dhanya Maliakal 829ba49c1c moving subframenumber into a 32 bit number, also in stremer, changing json header to mention 4 bit and version number 2017-02-28 15:30:53 +01:00
Dhanya Maliakal 447c5bb8fe gui works 2017-02-28 13:42:56 +01:00
Dhanya Maliakal 3b07afe3fc in the process of streamer 2017-02-27 15:38:46 +01:00
Dhanya Maliakal 936dfea8a7 works so far, no gui yet 2017-02-22 12:01:00 +01:00
Dhanya Maliakal 01d54a7a4c Complete rewrite of receiver, with new changes 2017-01-27 15:40:36 +01:00