42 Commits

Author SHA1 Message Date
cf8b0de433 slsReceiver, slsDetector, eiger and jungfrau server: client checks firmware and software an dreceiver compatibility for each time shared memory is cleaned up 2018-05-28 19:11:34 +02:00
8b39443197 slsReciever, slsDetector: configurable number of images per file, removed all the receiver threads from using generalData->maxframesperfile, yet to do: infinite images, bug fix, virtual hdf5 has -1 for all pixels in last image 2018-05-18 13:47:10 +02:00
1152555663 esrf changes: rx_udpsocksize sets/gets udp socket buffer size to be set, rx_realudpsocksize gets the real udp sock size buffer. At receiver config and at rx_udpsocksize command, dummy udp sockets created to know if set udp sock size fails (if fail, set to previous value), and also to get the real udp sock buffer size 2018-05-01 11:55:48 +02:00
2bd8e6c166 zmq fixed to have additional json headers using rx_zmqjsonheader 2018-04-09 16:33:14 +02:00
14546247e4 adding a receiver callback to be able to give modified size from the callback 2018-03-22 14:34:03 +01:00
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
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
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
460a44a9b1 made updatereceiver to actually update client in parameters that it can 2017-07-03 17:37:31 +02:00
Dhanya Maliakal
b03e35a8d6 sorted receiver client interface, more consistent 2017-07-03 13:31:17 +02:00
Dhanya Maliakal
f8c04a6a51 sorted the receiver client interface, more manageable 2017-06-30 18:17:33 +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
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
af8c750b5a made the eiger like the jungfrau ignoring packets 2016-11-25 12:22:21 +01:00
70326f8b10 Merged developer branch with anna's modifications for chiptestboard 2016-11-10 13:27:18 +01:00
Dhanya Maliakal
489b623afd trying to get in changes for activate in receiver 2016-10-05 08:24:35 +02:00
Dhanya Maliakal
9c8f663b8e done 2016-09-16 12:49:39 +02:00
Dhanya Maliakal
75a50a7ae0 receiver udp parameters should be sent to receiver everytime if rx_hostname is set 2016-05-10 17:13:27 +02:00
Dhanya Maliakal
d88b104aa8 bug fix for receiver call back 2016-03-15 15:28:50 +01:00
Dhanya Maliakal
3b0e2e611c jungfrau works 2015-11-27 15:57:19 +01:00
Dhanya Maliakal
777f04331d implemented fifo depth configurable from client 2015-11-17 10:31:09 +01:00
Dhanya Maliakal
e9f51e2ef5 put in the changes by Andrea to make it as static and remove as many destructors bugs 2015-11-02 17:33:10 +01:00
Dhanya Maliakal
4e52096991 included propix receiver 2015-07-21 16:25:56 +02:00
7c51b06777 Merge branch 'master' into eiger_receiver
Conflicts:
	include/slsReceiverTCPIPInterface.h
	slsReceiver/slsReceiver.cpp
	src/UDPStandardImplementation.cpp
	src/slsReceiverTCPIPInterface.cpp

it compiles
2014-11-11 15:54:12 +01:00
59fc6fbaf8 moved .h into include. Second round of cleaning 2014-09-10 09:39:11 +02:00