slsDetectorUsers is composed of multiSlsDetector instead of being its base class

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@268 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
bergamaschi
2012-10-02 07:23:24 +00:00
parent 2e5dc6515f
commit fe73d4cb92
5 changed files with 87 additions and 66 deletions

View File

@ -14,6 +14,8 @@ postProcessing::postProcessing(){
pCallbackArg = 0;
registerDataCallback(&defaultDataReadyFunc, NULL);
//cout << "done "<< endl;
rawDataReady = 0;
pRawDataArg = 0;
}

View File

@ -242,6 +242,9 @@ s
void registerDataCallback(int( *userCallback)(detectorData*, void*), void *pArg) {dataReady = userCallback; pCallbackArg = pArg;};
void registerRawDataCallback(int( *userCallback)(float*, void*), void *pArg) {rawDataReady = userCallback; pRawDataArg = pArg;};
@ -324,6 +327,9 @@ s
int (*dataReady)(detectorData*,void*);
void *pCallbackArg;
int (*rawDataReady)(float*,void*);
void *pRawDataArg;
};