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

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

43
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -3911,11 +3911,19 @@ int slsDetector::setDynamicRange(int n){
return thisDetector->dynamicRange;
};
/*
/*
int slsDetector::setROI(int nroi, int *xmin, int *xmax, int *ymin, int *ymax){
return thisDetector->nROI;
};
int slsDetector::getROI(int nroi, int *xmin, int *xmax, int *ymin, int *ymax){
return thisDetector->nROI;
};
*/
@ -6146,4 +6154,37 @@ int slsDetector::setFrameIndex(int index){
}
int slsDetector::calibratePedestal(int frames){
int ret=FAIL;
int retval=-1;
int fnum=F_CALIBRATE_PEDESTAL;
char mess[100];
#ifdef VERBOSE
std::cout<<"Calibrating Pedestal " <<std::endl;
#endif
if (thisDetector->onlineFlag==ONLINE_FLAG) {
if (controlSocket) {
if (controlSocket->Connect()>=0) {
controlSocket->SendDataOnly(&fnum,sizeof(fnum));
controlSocket->SendDataOnly(&frames,sizeof(frames));
controlSocket->ReceiveDataOnly(&ret,sizeof(ret));
if (ret!=FAIL)
controlSocket->ReceiveDataOnly(&retval,sizeof(retval));
else {
controlSocket->ReceiveDataOnly(mess,sizeof(mess));
std::cout<< "Detector returned error: " << mess << std::endl;
}
controlSocket->Disconnect();
if (ret==FORCE_UPDATE)
updateDetector();
}
}
}
return retval;
}