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

WIP

Browse Source
This commit is contained in:
maliakal_d
2019-08-19 10:48:05 +02:00
parent 7457c56533
commit 26958e99ef
6 changed files with 16 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
slsDetectorSoftware/include/multiSlsDetector.h
View File

@ -56,11 +56,8 @@ struct sharedMultiSlsDetector {
/** Number of detectors operated at once */
slsDetectorDefs::xy numberOfDetector;
/** total number of channels for all detectors */
slsDetectorDefs::xy numberOfChannels;
/** max number of channels for complete detector*/
slsDetectorDefs::xy maxNumberOfChannels;
/** max number of channels for complete detector*/
slsDetectorDefs::xy numberOfChannels;
/** flag for acquiring */
bool acquiringFlag;
@ -374,25 +371,18 @@ class multiSlsDetector : public virtual slsDetectorDefs {
/**
* Returns the total number of channels of all sls detectors including gap pixels
* @param d dimension d
* @param detPos -1 for all detectors in list or specific detector position
* @returns the total number of channels of all sls detectors including gap pixels
*/
slsDetectorDefs::xy getNumberOfChannels(int detPos = -1);//
/**
* Returns maximum number of channels of all sls detectors in each
* dimension d from shared memory
* @returns maximum number of channels of all sls detectors
*/
slsDetectorDefs::xy getMaxNumberOfChannels() const; //
slsDetectorDefs::xy getNumberOfChannels(int detPos = -1) const;//
/**
* Must be set before setting hostname
* Sets maximum number of channels of all sls detectors in each
* dimension d from shared memory
* @param c maximum number of channels of all sls detectors
*/
void setMaxNumberOfChannels(const slsDetectorDefs::xy c); //
void setNumberOfChannels(const slsDetectorDefs::xy c); //
/**
* Get Quad Type (Only for Eiger Quad detector hardware)

9
slsDetectorSoftware/include/slsDetectorUsers.h
View File

@ -101,15 +101,6 @@ public:
*/
int size() const;
/**
* Returns the maximum number of channels of all detectors
* (provided by user in config file using detsizechan command)
* number of channels in x and y are calculated according to these dimensions
* @param nx number of channels in horizontal
* @param ny number of channels in vertical
* @returns the maximum number of channels of all detectors
*/
int getMaximumDetectorSize(int &nx, int &ny);
/**
* Returns the size of detector/multi detector