almost compiling on 64bit...

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@297 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
bergamaschi
2012-10-16 14:50:05 +00:00
parent 0c89b0986f
commit 6fb6f72bc3
18 changed files with 408 additions and 179 deletions

View File

@ -194,11 +194,37 @@ string slsDetectorUsers::getDetectorType(){
}
void slsDetectorUsers::initDataset(int refresh){
myDetector->initDataset(refresh);
}
void slsDetectorUsers::addFrame(double *data, double pos, double i0, double t, string fname, double var){
myDetector->addFrame(data,pos,i0,t,fname,var);
}
void slsDetectorUsers::finalizeDataset(double *a, double *v, double *e, int &np){
myDetector->finalizeDataset(a, v, e, np);
}
void slsDetectorUsers::registerDataCallback(int( *userCallback)(detectorData*, void*), void *pArg){
myDetector->registerDataCallback(userCallback,pArg);
}
void slsDetectorUsers::registerRawDataCallback(int( *userCallback)(double*, void*), void *pArg){
void slsDetectorUsers::registerRawDataCallback(int( *userCallback)(double*, int, void*), void *pArg){
myDetector->registerRawDataCallback(userCallback,pArg);
}