detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-12 21:07:13 +02:00
Code Issues Actions Packages Releases Activity

Removeudpcache (#65)

Browse Source 
* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* solved eiger 1-10g issue

* some fixes for remove udp cache to work

* bug fix virtual

* removed special handling of rx_udpip
This commit is contained in:
Dhanya Thattil
2019-09-30 14:46:25 +02:00
committed by GitHub
parent 6e6fcec698
commit ca054626e6
33 changed files with 1759 additions and 1379 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsReceiverSoftware/include/Listener.h
View File

@ -40,7 +40,7 @@ class Listener : private virtual slsDetectorDefs, public ThreadObject {
* @param sm pointer to silent mode
*/
Listener(int ind, detectorType dtype, Fifo* f, std::atomic<runStatus>* s,
uint32_t* portno, char* e, uint64_t* nf, uint32_t* dr,
uint32_t* portno, std::string* e, uint64_t* nf, uint32_t* dr,
int64_t* us, int64_t* as, uint32_t* fpf,
frameDiscardPolicy* fdp, bool* act, bool* depaden, bool* sm);
@ -222,7 +222,7 @@ class Listener : private virtual slsDetectorDefs, public ThreadObject {
uint32_t* udpPortNumber;
/** ethernet interface */
char* eth;
std::string* eth;
/** Number of Images to catch */
uint64_t* numImages;

10
slsReceiverSoftware/include/slsReceiverImplementation.h
View File

@ -503,15 +503,15 @@ class slsReceiverImplementation : private virtual slsDetectorDefs {
/**
* Set Ethernet Interface to listen to
* @param c ethernet inerface eg. eth0 (max of 1000 characters)
* @param c ethernet inerface eg. eth0
*/
void setEthernetInterface(const char *c);
void setEthernetInterface(const std::string &c);
/**
* Set second Ethernet Interface to listen to (jungfrau specific)
* @param c second ethernet inerface eg. eth0 (max of 1000 characters)
* @param c second ethernet inerface eg. eth0
*/
void setEthernetInterface2(const char *c);
void setEthernetInterface2(const std::string &c);
/**
* Set number of UDP Interfaces (jungfrau specific)
@ -933,7 +933,7 @@ class slsReceiverImplementation : private virtual slsDetectorDefs {
/** Number of UDP Interfaces */
int numUDPInterfaces;
/** Ethernet Interface */
char eth[MAX_NUMBER_OF_LISTENING_THREADS][MAX_STR_LENGTH];
std::vector <std::string> eth;
/** Server UDP Port Number*/
uint32_t udpPortNum[MAX_NUMBER_OF_LISTENING_THREADS];
/** udp socket buffer size */

19
slsReceiverSoftware/include/slsReceiverTCPIPInterface.h
View File

@ -159,9 +159,6 @@ class slsReceiverTCPIPInterface : private virtual slsDetectorDefs {
/** set roi */
int set_roi(sls::ServerInterface2 &socket);
/** Set up UDP Details */
int setup_udp(sls::ServerInterface2 &socket);
/** set acquisition period, frame number etc */
int set_timer(sls::ServerInterface2 &socket);
@ -300,6 +297,22 @@ class slsReceiverTCPIPInterface : private virtual slsDetectorDefs {
/** read n lines */
int set_read_n_lines(sls::ServerInterface2 &socket);
/** set udp ip */
int set_udp_ip(sls::ServerInterface2 &socket);
/** set udp ip2 */
int set_udp_ip2(sls::ServerInterface2 &socket);
/** set udp port */
int set_udp_port(sls::ServerInterface2 &socket);
/** set udp port2 */
int set_udp_port2(sls::ServerInterface2 &socket);
/** set number of udp interfaces */
int set_num_interfaces(sls::ServerInterface2 &socket);
/** detector type */
detectorType myDetectorType;