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

removed create and delete module

Browse Source
This commit is contained in:
Erik Frojdh
2019-04-17 17:17:59 +02:00
parent ee20cfab1e
commit 849d3ba049
4 changed files with 79 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
slsDetectorSoftware/include/multiSlsDetector.h
View File

@ -1488,13 +1488,6 @@ class multiSlsDetector : public virtual slsDetectorDefs {
*/
int setAutoComparatorDisableMode(int ival = -1, int detPos = -1);
/**
* Returns the trimbits from the detector's shared memmory (Mythen, Eiger)
* @param retval is the array with the trimbits
* @param detPos -1 for all detectors in list or specific detector position
* @returns total number of channels for the detector
*/
int getChanRegs(double *retval, int detPos = -1);
/**
* Set Rate correction ( Eiger)

35
slsDetectorSoftware/include/slsDetector.h
View File

@ -1305,12 +1305,12 @@ class slsDetector : public virtual slsDetectorDefs{
*/
int setAutoComparatorDisableMode(int ival = -1);
/**
* Returns the trimbits from the detector's shared memmory (Eiger)
* @param retval is the array with the trimbits
* @returns total number of channels for the detector
/**
* Get trimbit filename with path for settings and energy
*
*/
int getChanRegs(double *retval);
std::string getTrimbitFilename(detectorSettings settings, int e_eV);
/**
* Configure Module (Eiger)
@ -1327,7 +1327,7 @@ class slsDetector : public virtual slsDetectorDefs{
* Get module structure from detector (all detectors)
* @returns pointer to module structure (which has been created and must then be deleted)
*/
sls_detector_module *getModule();
sls_detector_module getModule();
/**
* Set Rate correction (Eiger)
@ -1742,27 +1742,6 @@ class slsDetector : public virtual slsDetectorDefs{
*/
void initializeDetectorStructure(detectorType type);
/**
* Allocates the memory for a sls_detector_module structure and initializes it
* Uses current detector type
* @returns myMod the pointer to the allocate memory location
*/
sls_detector_module *createModule();
/**
* Allocates the memory for a sls_detector_module structure and initializes it
* Has detector type
* @param type detector type
* @returns myMod the pointer to the allocate dmemory location
*/
sls_detector_module *createModule(detectorType type);
/**
* Frees the memory for a sls_detector_module structure
* @param myMod the pointer to the memory to be freed
*/
void deleteModule(sls_detector_module *myMod);
/**
* Send a sls_detector_module structure over socket
* @param myMod module structure to send
@ -1818,7 +1797,7 @@ class slsDetector : public virtual slsDetectorDefs{
* @returns the pointer to myMod or NULL if reading the file failed
*/
sls_detector_module *readSettingsFile(const std::string &fname, sls_detector_module *myMod = nullptr, int tb = 1);
sls_detector_module readSettingsFile(const std::string &fname, int tb = 1);
/**
* writes a trim/settings file