diff --git a/slsDetectorCalibration/interpolations/eta2InterpolationBase.h b/slsDetectorCalibration/interpolations/eta2InterpolationBase.h index afd4ada93..26431ed92 100644 --- a/slsDetectorCalibration/interpolations/eta2InterpolationBase.h +++ b/slsDetectorCalibration/interpolations/eta2InterpolationBase.h @@ -195,11 +195,11 @@ class eta2InterpolationBase : public virtual etaInterpolationBase { ex=nbetaX-1; } if (ey<0) { - cout << "y*"<< ey << endl; + cout << "y*"<< ey << " " << nbetaY << endl; ey=0; } if (ey>=nbetaY) { - cout << "y?"<< ey << endl; + cout << "y?"<< ey << " " << nbetaY << endl; ey=nbetaY-1; } diff --git a/slsDetectorCalibration/interpolations/etaInterpolationBase.h b/slsDetectorCalibration/interpolations/etaInterpolationBase.h index e44396dc0..52273aab0 100644 --- a/slsDetectorCalibration/interpolations/etaInterpolationBase.h +++ b/slsDetectorCalibration/interpolations/etaInterpolationBase.h @@ -152,7 +152,7 @@ class etaInterpolationBase : public slsInterpolation { /* return 0; */ /* } */ nbetaX=nnx; - nbetaY=nnx; + nbetaY=nny; if (gm) { if (heta) { delete [] heta; diff --git a/slsDetectorCalibration/moenchExecutables/moench03Interpolation.cpp b/slsDetectorCalibration/moenchExecutables/moench03Interpolation.cpp index daaff72ab..ca6bf5d4e 100644 --- a/slsDetectorCalibration/moenchExecutables/moench03Interpolation.cpp +++ b/slsDetectorCalibration/moenchExecutables/moench03Interpolation.cpp @@ -119,7 +119,7 @@ int main(int argc, char *argv[]) { #ifndef NOINTERPOLATION cout << "read ff " << argv[2] << endl; sprintf(fname,"%s",argv[2]); - interp->readFlatField(fname); + interp->readFlatField(fname, etamin, etamax); interp->prepareInterpolation(ok);//, MAX_ITERATIONS); #endif // return 0; @@ -161,23 +161,20 @@ int main(int argc, char *argv[]) { totph++; if (lastframe!=cl.iframe) { lastframe=cl.iframe; - // cout << cl.iframe << endl; - // f0=cl.iframe; if (nframes==0) f0=lastframe; nframes++; } - //quad=interp->calcQuad(cl.get_cluster(), sum, totquad, sDum); quad=interp->calcEta(cl.get_cluster(), etax, etay, sum, totquad, sDum); if (sum>cmin && totquad/sum>0.8 && totquad/sum<1.2 && sum200 && sum<580) { // interp->getInterpolatedPosition(cl.x,cl.y, totquad,quad,cl.get_cluster(),int_x, int_y); // #ifdef SOLEIL // if (cl.x>210 && cl.x<240 && cl.y>210 && cl.y<240) { // #endif #ifndef FF - // interp->getInterpolatedPosition(cl.x,cl.y, cl.get_cluster(),int_x, int_y); - interp->getInterpolatedPosition(cl.x,cl.y, etax, etay, quad,int_x, int_y); + // interp->getInterpolatedPosition(cl.x,cl.y, cl.get_cluster(),int_x, int_y); + interp->getInterpolatedPosition(cl.x,cl.y, etax, etay, quad,int_x, int_y); // cout <<"**************"<< endl; // cout << cl.x << " " << cl.y << " " << sum << endl; // cl.print();