detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-17 04:59:02 +01:00
Code Issues Actions Packages Releases Activity

included detailed error of settings file could not find

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@655 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2013-08-16 13:48:27 +00:00
parent 3098664c8f
commit 13189b6414
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
slsDetectorSoftware/commonFiles/error_defs.h
View File

@@ -37,8 +37,9 @@ using namespace std;
#define COULDNOT_SET_ROI 0x0000000000000004ULL #define COULDNOT_SET_ROI 0x0000000000000004ULL
#define RECEIVER_READ_FREQUENCY 0x0000000000000008ULL #define RECEIVER_READ_FREQUENCY 0x0000000000000008ULL
#define SETTINGS_NOT_SET 0x0000000000000010ULL #define SETTINGS_NOT_SET 0x0000000000000010ULL
#define COULDNOT_START_RECEIVER 0x0000000000000020ULL // default error like starting threads #define SETTINGS_FILE_NOT_OPEN 0x0000000000000020ULL
#define COULDNOT_STOP_RECEIVER 0x0000000000000040ULL #define COULDNOT_START_RECEIVER 0x0000000000000040ULL // default error like starting threads
#define COULDNOT_STOP_RECEIVER 0x0000000000000080ULL
/** @short class returning all error messages for error mask */ /** @short class returning all error messages for error mask */
class errorDefs { class errorDefs {
@@ -99,6 +100,9 @@ public:
if(slsErrorMask&SETTINGS_NOT_SET) if(slsErrorMask&SETTINGS_NOT_SET)
retval.append("Could not set settings.\n"); retval.append("Could not set settings.\n");
if(slsErrorMask&SETTINGS_FILE_NOT_OPEN)
retval.append("Could not open settings file. Verify if it exists.\n");
if(slsErrorMask&COULDNOT_START_RECEIVER) if(slsErrorMask&COULDNOT_START_RECEIVER)
retval.append("Could not start receiver.\n"); retval.append("Could not start receiver.\n");

4
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@@ -2936,8 +2936,8 @@ slsDetectorDefs::detectorSettings slsDetector::setSettings( detectorSettings ise
readCalibrationFile(calfname,myMod->gain, myMod->offset); readCalibrationFile(calfname,myMod->gain, myMod->offset);
setModule(*myMod); setModule(*myMod);
}else{ }else{
std::cout << "Could not set settings" << endl; std::cout << "Could not open settings file" << endl;
setErrorMask((getErrorMask())|(SETTINGS_NOT_SET)); setErrorMask((getErrorMask())|(SETTINGS_FILE_NOT_OPEN));
return thisDetector->currentSettings; return thisDetector->currentSettings;
} }
} }