detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-23 01:58:00 +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

9
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -126,8 +126,7 @@ slsDetector::slsDetector(int id,multiSlsDetector *p) :slsDetectorUtils(),
adcs(NULL),
chipregs(NULL),
chanregs(NULL),
thisReceiver(NULL),
errorMask(0)
thisReceiver(NULL)
{
@ -177,8 +176,7 @@ slsDetector::slsDetector(detectorType type, int id,multiSlsDetector *p): slsDete
adcs(NULL),
chipregs(NULL),
chanregs(NULL),
thisReceiver(NULL),
errorMask(0)
thisReceiver(NULL)
{
while (shmId<0) {
@ -232,8 +230,7 @@ slsDetector::slsDetector(char *name, int id, int cport,multiSlsDetector *p) : sl
adcs(NULL),
chipregs(NULL),
chanregs(NULL),
thisReceiver(NULL),
errorMask(0)
thisReceiver(NULL)
{

20
slsDetectorSoftware/slsDetector/slsDetector.h
View File

@ -1523,23 +1523,6 @@ class slsDetector : public slsDetectorUtils, public energyConversion {
int fillModuleMask(int *mM);
/**
Sets error mask
@param error mask to be set to
/returns error mask
*/
int setErrorMask(int i=-1){errorMask=i;return errorMask;}
/**returns error mask */
int getErrorMask(){return errorMask;}
/**
clears error mask
/returns error mask
*/
int clearErrorMask(){errorMask=0;return errorMask;}
protected:
@ -1601,9 +1584,6 @@ class slsDetector : public slsDetectorUtils, public energyConversion {
receiverInterface *thisReceiver;
/** Error Mask*/
int errorMask;
/** Initializes the shared memory
\param type is needed to define the size of the shared memory

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