detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-16 04:29:22 +01:00
Code Issues Actions Packages Releases Activity

removed unused multi functions

Browse Source
This commit is contained in:
maliakal_d
2019-10-30 18:20:16 +01:00
parent ba3bc9c408
commit ba9a0c7917
15 changed files with 157 additions and 3737 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1550
slsDetectorSoftware/include/multiSlsDetector.h
View File

File diff suppressed because it is too large Load Diff

16
slsDetectorSoftware/include/slsDetector.h
View File

@@ -169,6 +169,9 @@ struct sharedSlsDetector {
/** reciever dbit offset */
int rxDbitOffset;
/** num udp interfaces */
int numUDPInterfaces;
};
class slsDetector : public virtual slsDetectorDefs {
@@ -258,13 +261,7 @@ class slsDetector : public virtual slsDetectorDefs {
* Get Detector type from shared memory variable
* @returns detector type from shared memory variable
*/
detectorType getDetectorTypeAsEnum() const;
/**
* Gets string version of detector type from shared memory variable
* @returns string version of detector type from shared memory variable
*/
std::string getDetectorTypeAsString() const;
detectorType getDetectorType() const;
/**
* Gets detector type from detector and set it in receiver
@@ -554,8 +551,6 @@ class slsDetector : public virtual slsDetectorDefs {
*/
int setDynamicRange(int n = -1);
int getDynamicRangeFromShm();
/**
* Set/get dacs value
* @param val value (in V)
@@ -848,6 +843,9 @@ class slsDetector : public virtual slsDetectorDefs {
*/
void setNumberofUDPInterfaces(int n);
/** Returns the number of udp interfaces from shared memory */
int getNumberofUDPInterfacesFromShm();
/**
* Returns the number of UDP interfaces to stream data from detector
* (Jungfrau only)

12
slsDetectorSoftware/include/slsDetectorCommand.h
View File

@@ -33,16 +33,7 @@ class slsDetectorCommand : public virtual slsDetectorDefs {
std::vector<std::string> getAllCommands();
/* /\** */
/* returns the help for the executeLine command */
/* \param os output stream to return the help to */
/* \param action can be PUT_ACTION or GET_ACTION (from text client even READOUT_ACTION for acquisition) */
/* *\/ */
std::string helpLine(int narg, const char * const args[], int action=HELP_ACTION, int detPos = -1);
static std::string helpAcquire(int action);
static std::string helpFree(int action);
static std::string helpSN(int action);
static std::string helpConfiguration(int action);
@@ -51,9 +42,6 @@ class slsDetectorCommand : public virtual slsDetectorDefs {
std::string cmdUnknown(int narg, const char * const args[], int action, int detPos = -1);
std::string cmdAcquire(int narg, const char * const args[], int action, int detPos = -1);
std::string cmdFree(int narg, const char * const args[], int action, int detPos = -1);
std::string cmdHelp(int narg, const char * const args[], int action, int detPos = -1);
std::string cmdSN(int narg, const char * const args[], int action, int detPos = -1);
std::string cmdConfiguration(int narg, const char * const args[], int action, int detPos = -1);