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

got rid of <0.00015 rate correction error check

Browse Source
This commit is contained in:
Dhanya Maliakal 2016-08-04 17:27:45 +02:00
parent 29ba1f4042
commit ef9d64de64
4 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorSoftware/commonFiles/error_defs.h
View File

@ -58,8 +58,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 #define DETECTOR_NETWORK_PARAMETER 0x0000000000400000ULL
#define DETECTOR_NETWORK_PARAMETER 0x0000000000800000ULL
// 0x00000000FFFFFFFFULL // 0x00000000FFFFFFFFULL
/** @short class returning all error messages for error mask */ /** @short class returning all error messages for error mask */
@ -188,9 +187,6 @@ 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");
if(slsErrorMask&DETECTOR_NETWORK_PARAMETER) if(slsErrorMask&DETECTOR_NETWORK_PARAMETER)
retval.append("Could not set/get detector network parameter\n"); retval.append("Could not set/get detector network parameter\n");

2
slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -546,7 +546,7 @@ int64_t setRateCorrection(int64_t custom_tau_in_nsec){//in nanosec (will never b
if(ret<=0){ if(ret<=0){
cprintf(RED,"Rate correction failed. Deactivating rate correction\n"); cprintf(RED,"Rate correction failed. Deactivating rate correction\n");
Feb_Control_SetRateCorrectionVariable(0); Feb_Control_SetRateCorrectionVariable(0);
return ret;//-1 is for tau/subexptime error, 0 for all other errors return ret;
} }
} }
//activating rate correction //activating rate correction

2
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -5066,8 +5066,6 @@ 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));
} }
disconnectControl(); disconnectControl();
if (ret==FORCE_UPDATE) if (ret==FORCE_UPDATE)

2
slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c
View File

@ -1969,8 +1969,6 @@ int set_module(int file_des) {
else if (getRateCorrectionEnable()){ else if (getRateCorrectionEnable()){
int64_t retvalTau = setRateCorrection(myTau); //myTau will not be -1 here int64_t retvalTau = setRateCorrection(myTau); //myTau will not be -1 here
if(myTau != retvalTau){ if(myTau != retvalTau){
if(retvalTau == -1)
strcat(mess," Rate correction Deactivated, (tau/subexptime) must be < 0.0015\n");
cprintf(RED,"%s",mess); cprintf(RED,"%s",mess);
ret=FAIL; ret=FAIL;
} }