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

client multi is updated with argument c++11 threading, need to update sls detector with arguments and removing imod

Browse Source
This commit is contained in:
maliakal_d
2018-10-04 17:24:37 +02:00
parent 1c70f9ec65
commit ab8b07f2ee
5 changed files with 1220 additions and 1527 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
View File

@ -101,9 +101,6 @@ private:
* file in a separate thread) */
int threadedProcessing;
/** dead time (in ns) for rate corrections */
double tDead;
/** flag for acquiring */
bool acquiringFlag;
@ -825,9 +822,8 @@ public:
* Ensures that min is less than max in both dimensions (Gotthard)
* @param n number of rois
* @param r array of rois
* @param detPos -1 for all detectors in list or specific detector position
*/
void verifyMinMaxROI(int n, ROI r[], int detPos = -1);
void verifyMinMaxROI(int n, ROI r[]);
/**
* Set ROI (Gotthard)
@ -1047,23 +1043,8 @@ public:
/**
* Get rate correction ( Eiger)
* @param t reference for dead time
* @param detPos -1 for all detectors in list or specific detector position
* @returns 0 if rate correction disabled, > 0 otherwise
*/
int getRateCorrection(double &t, int detPos = -1);
/**
* Get rate correction tau ( Eiger)
* @param detPos -1 for all detectors in list or specific detector position
* @returns 0 if rate correction disabled, otherwise the tau used for the correction
*/
double getRateCorrectionTau(int detPos = -1);
/**
* Get rate correction ( Eiger)
* @param detPos -1 for all detectors in list or specific detector position
* @returns 0 if rate correction disabled, > 0 otherwise
* @returns 0 if rate correction disabled, > 0 otherwise (ns)
*/
int getRateCorrection(int detPos = -1);
@ -1388,20 +1369,18 @@ public:
* @param fname file to read from
* @param level if 2 reads also reads trimbits, angular conversion coefficients etc.
* from files with default extensions as generated by dumpDetectorSetup
* @param detPos -1 for all detectors in list or specific detector position
* @returns OK or FAIL
*/
int retrieveDetectorSetup(std::string const fname, int level=0, int detPos = -1);
int retrieveDetectorSetup(std::string const fname, int level=0);
/**
* Saves the detector setup to file
* @param fname file to write to
* @param level if 2 reads also trimbits, flat field, angular correction etc.
* and writes them to files with automatically added extension
* @param detPos -1 for all detectors in list or specific detector position
* @returns OK or FAIL
*/
int dumpDetectorSetup(std::string const fname, int level=0, int detPos = -1);
int dumpDetectorSetup(std::string const fname, int level=0);
/**
* register callback for accessing acquisition final data