diff --git a/slsDetectorSoftware/commonFiles/error_defs.h b/slsDetectorSoftware/commonFiles/error_defs.h index 7253945bc..8bdce3f6e 100644 --- a/slsDetectorSoftware/commonFiles/error_defs.h +++ b/slsDetectorSoftware/commonFiles/error_defs.h @@ -58,8 +58,7 @@ using namespace std; #define COULD_NOT_PULSE_PIXEL_NMOVE 0x0000000000080000ULL #define COULD_NOT_PULSE_CHIP 0x0000000000100000ULL #define COULD_NOT_SET_RATE_CORRECTION 0x0000000000200000ULL -#define RATE_CORRECTION_TAU_SUBEXPOSURE 0x0000000000400000ULL -#define DETECTOR_NETWORK_PARAMETER 0x0000000000800000ULL +#define DETECTOR_NETWORK_PARAMETER 0x0000000000400000ULL // 0x00000000FFFFFFFFULL /** @short class returning all error messages for error mask */ @@ -188,9 +187,6 @@ public: if(slsErrorMask&COULD_NOT_SET_RATE_CORRECTION) 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) retval.append("Could not set/get detector network parameter\n"); diff --git a/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c b/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c index 3ea6aa8fd..798a39f65 100644 --- a/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c @@ -546,7 +546,7 @@ int64_t setRateCorrection(int64_t custom_tau_in_nsec){//in nanosec (will never b if(ret<=0){ cprintf(RED,"Rate correction failed. Deactivating rate correction\n"); Feb_Control_SetRateCorrectionVariable(0); - return ret;//-1 is for tau/subexptime error, 0 for all other errors + return ret; } } //activating rate correction diff --git a/slsDetectorSoftware/slsDetector/slsDetector.cpp b/slsDetectorSoftware/slsDetector/slsDetector.cpp index 25aa9973c..fcf47da2a 100644 --- a/slsDetectorSoftware/slsDetector/slsDetector.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetector.cpp @@ -5066,8 +5066,6 @@ int slsDetector::setRateCorrection(double t){ controlSocket->ReceiveDataOnly(mess,sizeof(mess)); std::cout<< "Detector returned error: " << mess << std::endl; setErrorMask((getErrorMask())|(COULD_NOT_SET_RATE_CORRECTION)); - if(strcasestr(mess,"tau/subexptime")) - setErrorMask((getErrorMask())|(RATE_CORRECTION_TAU_SUBEXPOSURE)); } disconnectControl(); if (ret==FORCE_UPDATE) diff --git a/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c b/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c index 052a336d2..2b3bbd7cb 100755 --- a/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c +++ b/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c @@ -1969,8 +1969,6 @@ int set_module(int file_des) { else if (getRateCorrectionEnable()){ int64_t retvalTau = setRateCorrection(myTau); //myTau will not be -1 here if(myTau != retvalTau){ - if(retvalTau == -1) - strcat(mess," Rate correction Deactivated, (tau/subexptime) must be < 0.0015\n"); cprintf(RED,"%s",mess); ret=FAIL; }