detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-22 01:27:59 +02:00
Code Issues Actions Packages Releases Activity

added error mask properly inherited by base; mask exist only for cannot connect to detector, receiver and could not configure mac

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@452 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2013-02-06 15:22:45 +00:00
parent 7a55ed9a74
commit 1d03be832f
7 changed files with 82 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
slsDetectorSoftware/slsDetector/slsDetectorBase.h
View File

@ -48,6 +48,7 @@
#include "sls_detector_defs.h"
#include "error_defs.h"
#include <string>
@ -63,7 +64,7 @@ using namespace std;
*/
//public virtual slsDetectorUsers,
class slsDetectorBase : public virtual slsDetectorDefs {
class slsDetectorBase : public virtual slsDetectorDefs, public virtual errorDefs {
public:
@ -473,23 +474,6 @@ class slsDetectorBase : public virtual slsDetectorDefs {
virtual int* readFrameFromReceiver(char* fName, int &fIndex)=0;
/** Gets error mask
/returns error mask
*/
virtual int getErrorMask()=0;
/**
Sets error mask
@param error mask to be set to
/returns error mask
*/
virtual int setErrorMask(int i=-1)=0;
/**
clears error mask
/returns error mask
*/
virtual int clearErrorMask()=0;
/** returns detector type string from detector type index
\param t string can be Mythen, Pilatus, Eiger, Gotthard, Agipd, Unknown