added calibrate pedestal for gotthard

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

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: