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

WIP

Browse Source
This commit is contained in:
maliakal_d
2019-08-08 11:11:08 +02:00
parent 095a7eac05
commit 553b7d8568
4 changed files with 53 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
slsDetectorSoftware/include/Detector.h
View File

@ -209,6 +209,26 @@ class Detector {
*/
Result<std::string> getDetectorTypeAsString(Positions pos = {}) const;
/**
* Returns the number of detectors in the multidetector structure
* @returns number of detectors
*/
int getNumberOfDetectors() const;
/**
* Returns number of detectors in dimension d
* @param d dimension d
* @returns number of detectors in dimension d
*/
int getNumberOfDetectors(defs::dimension d) const;
/**
* Returns the number of detectors in each direction
@param nx number of detectors in x direction
@param ny number of detectors in y direction
*/
void getNumberOfDetectors(int &nx, int &ny) const;
// Erik
/** CTB only.Sets the mask applied to every pattern. */

28
slsDetectorSoftware/include/multiSlsDetector.h
View File

@ -347,19 +347,11 @@ class multiSlsDetector : public virtual slsDetectorDefs {
*/
std::string getHostname(int detPos = -1) const;//
/**
* Appends detectors to the end of the list in shared memory
* Connects to them
* @param name concatenated hostname of the sls detectors to be appended to
* the list
*/
void addMultipleDetectors(const char *name);// ????
/**
* Get Detector type as an enum
* @returns detector type
*/
detectorType getDetectorTypeAsEnum() const;
detectorType getDetectorTypeAsEnum() const; //
/**
* Get Detector type for a particular sls detector or get the first one
@ -367,7 +359,7 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* @returns detector type of sls detector in position pos, if -1, returns
* the first det type
*/
detectorType getDetectorTypeAsEnum(int detPos);//??
detectorType getDetectorTypeAsEnum(int detPos);//
/**
* Concatenates string types of all sls detectors or
@ -376,27 +368,27 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* @returns detector type of sls detector in position pos, if -1,
* concatenates
*/
std::string getDetectorTypeAsString(int detPos = -1);
std::string getDetectorTypeAsString(int detPos = -1);//
/**
* Returns the number of detectors in the multidetector structure
* @returns number of detectors
*/
int getNumberOfDetectors() const;
int getNumberOfDetectors() const;//
/**
* Returns number of detectors in dimension d
* @param d dimension d
* @returns number of detectors in dimension d
*/
int getNumberOfDetectors(dimension d) const;
int getNumberOfDetectors(dimension d) const;//
/**
* Returns the number of detectors in each direction
@param nx number of detectors in x direction
@param ny number of detectors in y direction
*/
void getNumberOfDetectors(int &nx, int &ny) const;
void getNumberOfDetectors(int &nx, int &ny) const;//
/**
* Returns the total number of channels of all sls detectors from shared
@ -2241,6 +2233,14 @@ class multiSlsDetector : public virtual slsDetectorDefs {
*/
void initializeMembers(bool verify = true);
/**
* Appends detectors to the end of the list in shared memory
* Connects to them
* @param name concatenated hostname of the sls detectors to be appended to
* the list
*/
void addMultipleDetectors(const char *name);//
/**
* Update user details in detector structure
*/