bottom is defined as flippeddatax in config file, not anymore as argument for receiver

This commit is contained in:
Dhanya Maliakal
2016-11-30 10:36:46 +01:00
parent 0c8ca874e4
commit 09645cbba8
9 changed files with 116 additions and 81 deletions

View File

@@ -50,6 +50,12 @@ class UDPBaseImplementation : protected virtual slsReceiverDefs, public UDPInter
*/
char *getDetectorHostname() const;
/*
* Get flipped data across 'axis'
* @return if data is flipped across 'axis'
*/
int getFlippedData(int axis=0) const;
//***file parameters***
/**
@@ -234,11 +240,11 @@ class UDPBaseImplementation : protected virtual slsReceiverDefs, public UDPInter
*/
void configure(map<string, string> config_map);
/**
* Set Bottom Enable (eiger specific, should be moved to configure, and later from client via TCPIP)
* @param b is true for bottom enabled or false for bottom disabled
/*
* Get flipped data across 'axis'
* @return if data is flipped across 'axis'
*/
void setBottomEnable(const bool b);
void setFlippedData(int axis=0, int enable=-1);
//***file parameters***
@@ -532,8 +538,8 @@ class UDPBaseImplementation : protected virtual slsReceiverDefs, public UDPInter
bool tengigaEnable;
/** Fifo Depth */
uint32_t fifoDepth;
/** Bottom Half Module Enable */
bool bottomEnable;
/** enable for flipping data across both axes */
bool flippedData[2];
//***receiver parameters***
/** Maximum Number of Listening Threads/ UDP Ports */

View File

@@ -103,13 +103,19 @@ class UDPInterface {
* They access local cache of configuration or detector parameters *******
*************************************************************************/
//**initial parameters***
//**initial/detector parameters***
/*
* Get detector hostname
* @return hostname or NULL if uninitialized, must be released by calling function (max of 1000 characters)
*/
virtual char *getDetectorHostname() const = 0;
/*
* Get flipped data across 'axis'
* @return if data is flipped across 'axis'
*/
virtual int getFlippedData(int axis=0) const = 0;
//***file parameters***
/**
@@ -292,11 +298,11 @@ class UDPInterface {
*/
virtual void configure(map<string, string> config_map) = 0;
/**
* Set Bottom Enable (eiger specific, should be moved to configure, and later from client via TCPIP)
* @param b is true for bottom enabled or false for bottom disabled
/*
* Get flipped data across 'axis'
* @return if data is flipped across 'axis'
*/
virtual void setBottomEnable(const bool b)= 0;
virtual void setFlippedData(int axis=0, int enable=-1) = 0;
//***file parameters***

View File

@@ -61,14 +61,6 @@ class UDPStandardImplementation: private virtual slsReceiverDefs, public UDPBase
*************************************************************************/
//**initial parameters***
/**
* Overridden method
* Configure command line parameters
* @param config_map mapping of config parameters passed from command line arguments
*/
void configure(map<string, string> config_map);
//*** file parameters***
/**
* Set File Name Prefix (without frame index, file index and extension (_d0_f000000000000_8.raw))

View File

@@ -26,10 +26,9 @@ class slsReceiverTCPIPInterface : private virtual slsReceiverDefs {
* @param succecc socket creation was successfull
* @param rbase pointer to the receiver base
* @param pn port number (defaults to default port number)
* @param bot mode is bottom if true, else its a top half module
*/
slsReceiverTCPIPInterface(int &success, UDPInterface* rbase, int pn=-1, bool bot=false);
slsReceiverTCPIPInterface(int &success, UDPInterface* rbase, int pn=-1);
/**
* Sets the port number to listen to.
@@ -216,6 +215,9 @@ private:
/** activate/ deactivate */
int set_activate();
/** enable flipped data */
int set_flipped_data();
//General Functions
/** Locks Receiver */
@@ -284,9 +286,6 @@ private:
/** port number */
int portNumber;
/** true if bottom half module for eiger */
bool bottom;
/** Receiver not setup error message */
char SET_RECEIVER_ERR_MESSAGE[MAX_STR_LENGTH];

View File

@@ -54,8 +54,9 @@ enum {
F_ACTIVATE, /** < activate/deactivate readout */
F_STREAM_DATA_FROM_RECEIVER, /**< stream data from receiver to client */
F_READ_RECEIVER_TIMER /** < sets the timer between each data stream in receiver */
F_READ_RECEIVER_TIMER, /** < sets the timer between each data stream in receiver */
F_SET_FLIPPED_DATA_RECEIVER /** < sets the enable to flip data across x/y axis (bottom/top) */
/* Always append functions hereafter!!! */
};