Commit Graph

100 Commits

Author SHA1 Message Date
6f3898441e merge conflict from 3.0.1 to restream stop from recieveR 2017-11-30 19:05:47 +01:00
70bf6eb4cb restream stop from receiver 2017-11-30 18:39:08 +01:00
4466213882 makng the zmq work without external flag 2017-11-27 17:06:27 +01:00
ad64df01c7 somewhere 2017-11-23 14:53:40 +01:00
114c45c04a making gui work temporarily for jctb 2017-11-22 09:27:42 +01:00
5d34358f44 changin zmqip in rxr should also restart streaming 2017-11-21 15:11:29 +01:00
a0ad1fb3a3 Merge branch '3.0.1' into developer 2017-11-21 14:15:59 +01:00
d00df32e49 changing zmq rxr port should restart data streaming 2017-11-21 13:39:49 +01:00
b6ae3300a9 merge conflict fixed with developer(patches for file write disable, xcoord) 2017-10-19 15:35:34 +02:00
1cddb9a542 merge from 3.0.1 with patches for file write disable 2017-10-18 17:53:55 +02:00
72b71cd680 merge from 3.0 hotfixes done 2017-10-18 17:39:19 +02:00
75b94e6614 fixed file write enable bug from the last patch 2017-10-18 12:29:46 +02:00
e54767b69d conflict resolution with developer 2017-10-03 15:12:56 +02:00
0b82aabd2b merge with 3.0.1 conflicts resolved 2017-10-03 14:52:53 +02:00
7cde5dbe38 changes upto the receiver, not incl gui 2017-10-03 10:44:08 +02:00
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
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
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
0bacb903ea rest implementation, index issues 2017-07-13 14:44:03 +02:00
a11313fe96 removed copies 2017-03-24 15:15:30 +01:00
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
2bb8fa596a from the merge of 2.3 2017-03-24 12:22:49 +01:00
bb52676f50 merged from 2.3 without udpstandard 2017-03-24 10:34:31 +01:00
70a7217353 changed the header size to a better number 2017-03-23 15:17:21 +01:00
6f34dddb5a changed the file header size t0 1kb and changed its description in the header 2017-03-23 13:41:37 +01:00
b9eb3d5a52 somewere stuck with virtual template overloading 2017-03-23 11:56:17 +01:00
3b07afe3fc in the process of streamer 2017-02-27 15:38:46 +01:00
936dfea8a7 works so far, no gui yet 2017-02-22 12:01:00 +01:00
9e21583331 virtual, master all works, still to do rewriting file in an acquisition 2017-02-21 15:13:59 +01:00
2cd38fefcd master hdf5 does not work, but so far good 2017-02-16 12:48:15 +01:00
b260d08225 somewhere 2017-02-10 10:08:00 +01:00
c89f6e649c fnum wrong, need to add file features 2017-02-07 08:52:27 +01:00
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
01d54a7a4c Complete rewrite of receiver, with new changes 2017-01-27 15:40:36 +01:00
70a7d83175 somewhere 2017-01-18 15:22:05 +01:00
f6927ad1bf in between 2017-01-17 10:56:01 +01:00
adb5ab5ed1 chunked upto 1000 and new dataset every 10000 2017-01-03 12:11:55 +01:00
abb5bfb6e4 creating new datasets every 10,000 images in same file 2017-01-03 08:57:59 +01:00
ae48a0e251 made some groups and force closing 2016-12-15 09:26:25 +01:00
cdcb413241 removed hdf5 c, only c++ 2016-12-14 18:19:29 +01:00
f8b34a16dd converted to c++ 2016-12-14 18:15:47 +01:00
d3200dc76f moving towards c++ api 2016-12-12 14:24:24 +01:00
09645cbba8 bottom is defined as flippeddatax in config file, not anymore as argument for receiver 2016-11-30 10:36:46 +01:00
af8c750b5a made the eiger like the jungfrau ignoring packets 2016-11-25 12:22:21 +01:00
e6c7dfc440 adding exptime to receiver for file header 2016-11-14 11:57:34 +01:00
45fc87240f write number of frames and period in file header 2016-11-11 16:08:18 +01:00
9b9876e287 added the print temp losses 2016-11-08 16:03:44 +01:00
84bdf873ce introduced ignored packets and changed meaning of missing packets for jungfrau 2016-11-03 09:16:36 +01:00
ac87ae3d5b some changes, almost done 2016-10-31 12:27:54 +01:00
942f024761 changes to make jungfrau work 2016-10-27 08:27:31 +02:00