detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-26 08:10:02 +02:00
Code Issues Actions Packages Releases Activity

added error message tau/subexptime to error list

Browse Source
This commit is contained in:
Dhanya Maliakal 2016-02-17 18:01:58 +01:00
parent cb1a30c450
commit 4eba07ca90
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
slsDetectorSoftware/commonFiles/error_defs.h
View File

@ -57,6 +57,7 @@ using namespace std;
#define COULD_NOT_PULSE_PIXEL_NMOVE 0x0000000000080000ULL #define COULD_NOT_PULSE_PIXEL_NMOVE 0x0000000000080000ULL
#define COULD_NOT_PULSE_CHIP 0x0000000000100000ULL #define COULD_NOT_PULSE_CHIP 0x0000000000100000ULL
#define COULD_NOT_SET_RATE_CORRECTION 0x0000000000200000ULL #define COULD_NOT_SET_RATE_CORRECTION 0x0000000000200000ULL
#define RATE_CORRECTION_TAU_SUBEXPOSURE 0x0000000000400000ULL
// 0x00000000FFFFFFFFULL // 0x00000000FFFFFFFFULL
/** @short class returning all error messages for error mask */ /** @short class returning all error messages for error mask */
@ -181,6 +182,12 @@ public:
if(slsErrorMask&COULD_NOT_SET_RATE_CORRECTION) if(slsErrorMask&COULD_NOT_SET_RATE_CORRECTION)
retval.append("Could not set rate correction\n"); retval.append("Could not set rate correction\n");
if(slsErrorMask&RATE_CORRECTION_TAU_SUBEXPOSURE)
retval.append("Rate Correction Deactivated: (tau/subexptime) must be less than 0.0015\n");
//------------------------------------------------------ length of message
return retval; return retval;

1
slsDetectorSoftware/eigerDetectorServer/FebControl.c
View File

@ -1926,7 +1926,6 @@ int Feb_Control_SetRateCorrectionTable(unsigned int *table){
return 0; return 0;
} }
} }
cprintf(BLUE, "done with writing to memory\n");
return 1; return 1;
} }

4
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -2773,6 +2773,8 @@ int slsDetector::setModule(sls_detector_module module, int* gainval, int* offset
if(ret == FAIL && thisDetector->myDetectorType == EIGER && strcasestr(mess,"Rate")){ if(ret == FAIL && thisDetector->myDetectorType == EIGER && strcasestr(mess,"Rate")){
setErrorMask((getErrorMask())|(COULD_NOT_SET_RATE_CORRECTION)); setErrorMask((getErrorMask())|(COULD_NOT_SET_RATE_CORRECTION));
if(strcasestr(mess,"tau/subexptime"))
setErrorMask((getErrorMask())|(RATE_CORRECTION_TAU_SUBEXPOSURE));
thisDetector->correctionMask&=~(1<<RATE_CORRECTION); thisDetector->correctionMask&=~(1<<RATE_CORRECTION);
thisDetector->tDead = 0; thisDetector->tDead = 0;
} }
@ -5033,6 +5035,8 @@ int slsDetector::setRateCorrection(double t){
controlSocket->ReceiveDataOnly(mess,sizeof(mess)); controlSocket->ReceiveDataOnly(mess,sizeof(mess));
std::cout<< "Detector returned error: " << mess << std::endl; std::cout<< "Detector returned error: " << mess << std::endl;
setErrorMask((getErrorMask())|(COULD_NOT_SET_RATE_CORRECTION)); setErrorMask((getErrorMask())|(COULD_NOT_SET_RATE_CORRECTION));
if(strcasestr(mess,"tau/subexptime"))
setErrorMask((getErrorMask())|(RATE_CORRECTION_TAU_SUBEXPOSURE));
thisDetector->correctionMask&=~(1<<RATE_CORRECTION); thisDetector->correctionMask&=~(1<<RATE_CORRECTION);
thisDetector->tDead = 0; thisDetector->tDead = 0;
} }