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

moved sls_detector_module outside slsDetectorDefs class

Browse Source
This commit is contained in:
Erik Frojdh
2019-04-17 09:27:45 +02:00
parent cedde395a0
commit 91813a2c68
2 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
slsDetectorSoftware/src/slsDetector.cpp
View File

@ -368,11 +368,11 @@ void slsDetector::initializeDetectorStructure(detectorType type) {
} }
} }
slsDetectorDefs::sls_detector_module *slsDetector::createModule() { sls_detector_module *slsDetector::createModule() {
return createModule(detector_shm()->myDetectorType); return createModule(detector_shm()->myDetectorType);
} }
slsDetectorDefs::sls_detector_module * sls_detector_module *
slsDetector::createModule(detectorType type) { slsDetector::createModule(detectorType type) {
// get the detector parameters based on type // get the detector parameters based on type
detParameters parameters{type}; detParameters parameters{type};
@ -3709,7 +3709,7 @@ int slsDetector::setModule(sls_detector_module module, int tb) {
return ret; return ret;
} }
slsDetectorDefs::sls_detector_module *slsDetector::getModule() { sls_detector_module *slsDetector::getModule() {
int fnum = F_GET_MODULE; int fnum = F_GET_MODULE;
int ret = FAIL; int ret = FAIL;
FILE_LOG(logDEBUG1) << "Getting module"; FILE_LOG(logDEBUG1) << "Getting module";
@ -4810,7 +4810,7 @@ int slsDetector::setDigitalIODelay(uint64_t pinMask, int delay) {
return ret; return ret;
} }
slsDetectorDefs::sls_detector_module * sls_detector_module *
slsDetector::interpolateTrim(sls_detector_module *a, sls_detector_module *b, slsDetector::interpolateTrim(sls_detector_module *a, sls_detector_module *b,
const int energy, const int e1, const int e2, const int energy, const int e1, const int e2,
int tb) { int tb) {
@ -4887,7 +4887,7 @@ slsDetector::interpolateTrim(sls_detector_module *a, sls_detector_module *b,
return myMod; return myMod;
} }
slsDetectorDefs::sls_detector_module * sls_detector_module *
slsDetector::readSettingsFile(const std::string &fname, slsDetector::readSettingsFile(const std::string &fname,
sls_detector_module *myMod, int tb) { sls_detector_module *myMod, int tb) {

52
slsSupportLib/include/sls_detector_defs.h
View File

@ -62,7 +62,33 @@
#define DEFAULT_STREAMING_TIMER_IN_MS 200 #define DEFAULT_STREAMING_TIMER_IN_MS 200
/**
@short structure for a detector module
should not be used by unexperienced users
\see :: moduleRegisterBit ::chipRegisterBit :channelRegisterBit
@li reg is the module register (e.g. dynamic range? see moduleRegisterBit)
@li dacs is the pointer to the array of dac values (in V)
@li adcs is the pointer to the array of adc values (in V)
@li chipregs is the pointer to the array of chip registers
@li chanregs is the pointer to the array of channel registers
@li gain is the module gain
@li offset is the module offset
*/
typedef struct {
int serialnumber; /**< is the module serial number */
int nchan; /**< is the number of channels on the module*/
int nchip; /**< is the number of chips on the module */
int ndac; /**< is the number of dacs on the module */
int reg; /**< is the module register settings (gain level) */
int iodelay; /**< iodelay */
int tau; /**< tau */
int eV; /**< threshold energy */
int *dacs; /**< is the pointer to the array of the dac values (in V) */
int *chanregs; /**< is the pointer to the array of the channel registers */
} sls_detector_module;
typedef char mystring[MAX_STR_LENGTH]; typedef char mystring[MAX_STR_LENGTH];
@ -220,33 +246,7 @@ public:
int ymax; /**< is the roi ymax (in channel number)*/ int ymax; /**< is the roi ymax (in channel number)*/
} ROI ; } ROI ;
/**
@short structure for a detector module
should not be used by unexperienced users
\see :: moduleRegisterBit ::chipRegisterBit :channelRegisterBit
@li reg is the module register (e.g. dynamic range? see moduleRegisterBit)
@li dacs is the pointer to the array of dac values (in V)
@li adcs is the pointer to the array of adc values (in V)
@li chipregs is the pointer to the array of chip registers
@li chanregs is the pointer to the array of channel registers
@li gain is the module gain
@li offset is the module offset
*/
typedef struct {
int serialnumber; /**< is the module serial number */
int nchan; /**< is the number of channels on the module*/
int nchip; /**< is the number of chips on the module */
int ndac; /**< is the number of dacs on the module */
int reg; /**< is the module register settings (gain level) */
int iodelay; /**< iodelay */
int tau; /**< tau */
int eV; /**< threshold energy */
int *dacs; /**< is the pointer to the array of the dac values (in V) */
int *chanregs; /**< is the pointer to the array of the channel registers */
} sls_detector_module;
/** /**