detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-21 21:12:56 +01:00
Code Issues Actions Packages Releases Activity

fixed probelem with multiThreadedInterpolatingDetector

Browse Source
This commit is contained in:
bergamaschi
2018-10-16 17:17:24 +02:00
parent 4aa720eecb
commit 38a6393dde
5 changed files with 85 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorCalibration/interpolatingDetector.h
View File

@@ -127,7 +127,6 @@ class interpolatingDetector : public singlePhotonDetector {
return interp->getInterpolatedImage();
else
return analogDetector<uint16_t>::getImage();
//cout << "null " << endl;
}
#ifdef MYROOT1
@@ -179,7 +178,8 @@ int addFrame(char *data, int *ph=NULL, int ff=0) {
double int_x, int_y;
double eta_x, eta_y;
if (interp) {
pthread_mutex_lock(fi);
cout << "int" << endl;
pthread_mutex_lock(fi);
for (nph=0; nph<nphFrame; nph++) {
if (ff) {
interp->addToFlatField((clusters+nph)->quadTot,(clusters+nph)->quad,(clusters+nph)->get_cluster(),eta_x, eta_y);
@@ -214,7 +214,7 @@ int addFrame(char *data, int *ph=NULL, int ff=0) {
if (interp)
addFrame(data,val,1);
else
singlePhotonDetector::processData(data,val);
singlePhotonDetector::processData(data,val);
break;
default:
if (interp)