detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-11 04:17:15 +02:00
Code Issues Actions Packages Releases Activity

Fixed all warning in moenchZmqProcess

Browse Source
This commit is contained in:
bergamaschi
2019-09-25 12:14:15 +02:00
parent 26bc737445
commit 2a48f70320
13 changed files with 167 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorCalibration/interpolatingDetector.h
View File

@ -139,8 +139,8 @@ class interpolatingDetector : public singlePhotonDetector {
nph=addFrame(data,val,0);
if (interp)
return interp->getInterpolatedImage();
else
singlePhotonDetector::getImage();
//else
return singlePhotonDetector::getImage();
//return NULL;
};
@ -233,7 +233,7 @@ int addFrame(char *data, int *ph=NULL, int ff=0) {
};
virtual slsInterpolation *setInterpolation(slsInterpolation *ii){
int ok;
// int ok;
interp=ii;
/* pthread_mutex_lock(fi);
if (interp)