Merge branch '3.0.1' into developer

This commit is contained in:
Dhanya Maliakal
2017-11-20 15:14:13 +01:00
2 changed files with 2 additions and 2 deletions

View File

@ -204,7 +204,7 @@ class slsDetectorUsers
/**
@short enable/disable count rate corrections
\param i 0 disables, 1 enable, -1 gets
\param i 0 disables, 1 enables with default values, -1 gets
\returns 0 if count corrections disabled, 1 if enabled
*/
int enableCountRateCorrection(int i=-1);

View File

@ -99,7 +99,7 @@ class slsDetectorUtils : public slsDetectorActions, public postProcessing {
int enableFlatFieldCorrection(int i=-1) {if (i>0) setFlatFieldCorrectionFile("default"); else if (i==0) setFlatFieldCorrectionFile(""); return getFlatFieldCorrection();};
int enablePixelMaskCorrection(int i=-1) {if (i>0) setBadChannelCorrection("default"); else if (i==0) setBadChannelCorrection(""); return getBadChannelCorrection();};
int enableCountRateCorrection(int i=-1) {if (i>0) setRateCorrection(i); else if (i==0) setRateCorrection(0); return getRateCorrection();};
int enableCountRateCorrection(int i=-1) {if (i>0) setRateCorrection(-1); else if (i==0) setRateCorrection(0); return getRateCorrection();};
/**