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

Fixed some stuff for the Zmq process

Browse Source
This commit is contained in:
bergamaschi
2022-01-19 14:56:44 +01:00
parent bfccc004e8
commit 5403656e79
12 changed files with 221 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
slsDetectorCalibration/interpolations/etaInterpolationBase.h
View File

@ -302,7 +302,11 @@ float *gethhx()
double diff=0, d;
//double bsize=1./nSubPixels;
int nbad=0;
double p_tot_x[nSubPixelsX], p_tot_y[nSubPixelsY], p_tot[nSubPixelsX*nSubPixelsY];
double *p_tot_x=new double[nSubPixelsX];
double *p_tot_y=new double[nSubPixelsY];
double *p_tot= new double[nSubPixelsX*nSubPixelsY];
double maxdiff=0, mindiff=avg*nSubPixelsX*nSubPixelsY;
int ipx, ipy;
@ -362,6 +366,10 @@ float *gethhx()
// cout << "Bad pixels: " << 100.*(float)nbad/((float)(nSubPixels*nSubPixels)) << " %" << endl;
delete [] p_tot_x;
delete [] p_tot_y;
delete [] p_tot;
return sqrt(diff);
}

15
slsDetectorCalibration/interpolations/etaInterpolationPosXY.h
View File

@ -40,10 +40,10 @@ class etaInterpolationPosXY : public virtual etaInterpolationBase{
if (tot_eta<=0) {ok=0; return;};
double hx[nbetaX]; //profile x
double hy[nbetaY]; //profile y
double hix[nbetaX]; //integral of projection x
double hiy[nbetaY]; //integral of projection y
double *hx=new double[nbetaX]; //profile x
double *hy=new double[nbetaY]; //profile y
double *hix=new double[nbetaX]; //integral of projection x
double *hiy=new double[nbetaY]; //integral of projection y
// int ii=0;
double etax, etay;
for (int ib=0; ib<nbetaX; ib++) {
@ -166,7 +166,12 @@ class etaInterpolationPosXY : public virtual etaInterpolationBase{
#ifdef SAVE_ALL
debugSaveAll();
#endif
#endif
delete [] hx;
delete [] hy;
delete [] hix;
delete [] hiy;
return ;
}

3
slsDetectorCalibration/interpolations/slsInterpolation.h
View File

@ -37,7 +37,8 @@ class slsInterpolation
hint=new int[nSubPixelsX*nx*nSubPixelsY*ny];
};
virtual ~slsInterpolation(){ delete [] hint;}
slsInterpolation(slsInterpolation *orig){
nPixelsX=orig->nPixelsX;
nPixelsY=orig->nPixelsY;