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

Fixed build of the moenchZmqExecutables (#706)

Browse Source 
* changed to pure virtual methods for Clone and setClusterSize

* added std::

* added moench to the github actions build
This commit is contained in:
Erik Fröjdh
2023-03-29 15:01:22 +02:00
committed by GitHub
parent 08c0c59a28
commit 3b8c612103
5 changed files with 52 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
slsDetectorCalibration/interpolations/eta2InterpolationBase.h
View File

@ -23,7 +23,7 @@ class eta2InterpolationBase : public virtual etaInterpolationBase {
/* if (etamin>=etamax) { */
/* etamin=-1; */
/* etamax=2; */
/* // cout << ":" <<endl; */
/* // std::cout << ":" <<endl; */
/* } */
/* etastep=(etamax-etamin)/nbeta; */
@ -164,7 +164,7 @@ class eta2InterpolationBase : public virtual etaInterpolationBase {
dY = -1.;
break;
default:
cout << "bad quadrant" << endl;
std::cout << "bad quadrant" << std::endl;
dX = 0.;
dY = 0.;
}
@ -174,19 +174,19 @@ class eta2InterpolationBase : public virtual etaInterpolationBase {
ex = (etax - etamin) / etastepX;
ey = (etay - etamin) / etastepY;
if (ex < 0) {
cout << "x*" << ex << endl;
std::cout << "x*" << ex << std::endl;
ex = 0;
}
if (ex >= nbetaX) {
cout << "x?" << ex << endl;
std::cout << "x?" << ex << std::endl;
ex = nbetaX - 1;
}
if (ey < 0) {
cout << "y*" << ey << " " << nbetaY << endl;
std::cout << "y*" << ey << " " << nbetaY << std::endl;
ey = 0;
}
if (ey >= nbetaY) {
cout << "y?" << ey << " " << nbetaY << endl;
std::cout << "y?" << ey << " " << nbetaY << std::endl;
ey = nbetaY - 1;
}
@ -236,7 +236,7 @@ class eta2InterpolationBase : public virtual etaInterpolationBase {
// calcMyEta(totquad,quad,cl,etax, etay);
calcEta(totquad, cc, etax, etay);
// cout <<"******"<< etax << " " << etay << endl;
// std::cout <<"******"<< etax << " " << etay << std::endl;
return addToFlatFieldDistribution(etax, etay);
}
@ -270,16 +270,16 @@ class eta2InterpolationBase : public virtual etaInterpolationBase {
/* cc[0][1] = cl[yoff * 3 + xoff + 1]; */
/* cc[1][1] = cl[(yoff + 1) * 3 + xoff + 1]; */
/* /\* cout << cl[0] << " " << cl[1] << " " << cl[2] << endl; *\/ */
/* /\* cout << cl[3] << " " << cl[4] << " " << cl[5] << endl; *\/ */
/* /\* cout << cl[6] << " " << cl[7] << " " << cl[8] << endl; *\/ */
/* /\* cout <<"******"<<totquad << " " << quad << endl; *\/ */
/* /\* cout << cc[0][0]<< " " << cc[0][1] << endl; *\/ */
/* /\* cout << cc[1][0]<< " " << cc[1][1] << endl; *\/ */
/* /\* std::cout << cl[0] << " " << cl[1] << " " << cl[2] << std::endl; *\/ */
/* /\* std::cout << cl[3] << " " << cl[4] << " " << cl[5] << std::endl; *\/ */
/* /\* std::cout << cl[6] << " " << cl[7] << " " << cl[8] << std::endl; *\/ */
/* /\* std::cout <<"******"<<totquad << " " << quad << std::endl; *\/ */
/* /\* std::cout << cc[0][0]<< " " << cc[0][1] << std::endl; *\/ */
/* /\* std::cout << cc[1][0]<< " " << cc[1][1] << std::endl; *\/ */
/* // calcMyEta(totquad,quad,cl,etax, etay); */
/* calcEta(totquad, cc, etax, etay); */
/* // cout <<"******"<< etax << " " << etay << endl; */
/* // std::cout <<"******"<< etax << " " << etay << std::endl; */
/* return addToFlatFieldDistribution(etax, etay); */
/* } */
@ -331,7 +331,7 @@ class eta2InterpolationBase : public virtual etaInterpolationBase {
virtual int *getInterpolatedImage() {
int ipx, ipy;
// cout << "ff" << endl;
// std::cout << "ff" << std::endl;
calcDiff(1, hhx, hhy); // get flat
double avg = 0;
for (ipx = 0; ipx < nSubPixelsX; ipx++)
@ -347,8 +347,8 @@ class eta2InterpolationBase : public virtual etaInterpolationBase {
ipy = iby % nSubPixelsY - nSubPixelsY / 2;
if (ipy < 0)
ipy = nSubPixelsY + ipy;
// cout << ipx << " " << ipy << " " << ibx << " " << iby <<
// endl;
// std::cout << ipx << " " << ipy << " " << ibx << " " << iby <<
// std::endl;
if (flat[ipx + ipy * nSubPixelsX] > 0)
hintcorr[ibx + iby * nSubPixelsX * nPixelsX] =
hint[ibx + iby * nSubPixelsX * nPixelsX] *