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

added calibrate pedestal for gotthard

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@456 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2013-02-11 10:45:41 +00:00
parent 2c9f05e8fd
commit 4a4efda69f
11 changed files with 190 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -1575,8 +1575,12 @@ int multiSlsDetector::setROI(int nroi, int *xmin, int *xmax, int *ymin, int *yma
};
*/
int multiSlsDetector::getROI(int nroi, int *xmin, int *xmax, int *ymin, int *ymax){
};
*/
double* multiSlsDetector::decodeData(int *datain, double *fdata) {
double *dataout;
@ -3921,3 +3925,23 @@ int64_t multiSlsDetector::clearAllErrorMask(){
return getErrorMask();
}
int multiSlsDetector::calibratePedestal(int frames){
int ret=-100, ret1;
for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
if (detectors[idet]) {
ret1=detectors[idet]->calibratePedestal(frames);
if (ret==-100)
ret=ret1;
else if (ret!=ret1)
ret=-1;
}
}
return ret;
}

26
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
View File

@ -622,12 +622,25 @@ class multiSlsDetector : public slsDetectorUtils {
/**
set roi
not yet implemented
\param nroi number of rois
\param xmin x minimum of roi
\param xmax x maximum of roi
\param ymin y minimum of roi
\param ymax y maximum of roi
\returns number of rois added
*/
int setROI(int nroi=-1, int *xmin=NULL, int *xmax=NULL, int *ymin=NULL, int *ymax=NULL);
//int setROI(int nroi=-1, int *xmin=NULL, int *xmax=NULL, int *ymin=NULL, int *ymax=NULL);
/**
get roi
\param nroi number of rois
\param xmin x minimum of roi
\param xmax x maximum of roi
\param ymin y minimum of roi
\param ymax y maximum of roi
\returns number of rois
*/
//int getROI(int &xmin, int &xmax, int &ymin, int &ymax);
//Corrections
@ -1146,6 +1159,11 @@ class multiSlsDetector : public slsDetectorUtils {
*/
int64_t clearAllErrorMask();
/** Starts acquisition, calibrates pedestal and writes to fpga
/returns number of frames
*/
int calibratePedestal(int frames = 0);
protected: