detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-23 01:58:00 +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

18
slsDetectorCalibration/interpolations/etaInterpolationPosXY.h
View File

@ -14,8 +14,8 @@ class etaInterpolationPosXY : public virtual etaInterpolationBase {
int nb = -1, int nby = -1, double emin = 1,
double emax = 0)
: etaInterpolationBase(nx, ny, ns, nsy, nb, nby, emin, emax){
// cout << "epxy " << nb << " " << emin << " " << emax << endl;
// cout << nbeta << " " << etamin << " " << etamax << endl;
// std::cout << "epxy " << nb << " " << emin << " " << emax << std::endl;
// std::cout << nbeta << " " << etamin << " " << etamax << std::endl;
};
etaInterpolationPosXY(etaInterpolationPosXY *orig)
@ -32,14 +32,14 @@ class etaInterpolationPosXY : public virtual etaInterpolationBase {
///*Eta Distribution Rebinning*///
// double bsize=1./nSubPixels; //precision
// cout<<"nPixelsX = "<<nPixelsX<<" nPixelsY = "<<nPixelsY<<" nSubPixels
// std::cout<<"nPixelsX = "<<nPixelsX<<" nPixelsY = "<<nPixelsY<<" nSubPixels
// = "<<nSubPixels<<endl;
double tot_eta = 0;
double tot_eta_x = 0;
double tot_eta_y = 0;
for (int ip = 0; ip < nbetaX * nbetaY; ip++)
tot_eta += heta[ip];
cout << "total eta entries is :" << tot_eta << endl;
std::cout << "total eta entries is :" << tot_eta << std::endl;
if (tot_eta <= 0) {
ok = 0;
return;
@ -57,7 +57,7 @@ class etaInterpolationPosXY : public virtual etaInterpolationBase {
for (int iby = 0; iby < nbetaY; iby++) {
etay = etamin + iby * etastepY;
// cout << etax << endl;
// std::cout << etax << std::endl;
// tot_eta_x+=hx[iby];
if (etay >= 0 && etay <= 1)
@ -90,7 +90,7 @@ class etaInterpolationPosXY : public virtual etaInterpolationBase {
for (int ibx = 0; ibx < nbetaX; ibx++) {
etax = etamin + ibx * etastepX;
// cout << etax << endl;
// std::cout << etax << std::endl;
if (etax >= 0 && etax <= 1)
hx[ibx] = heta[ibx + ib * nbetaX];
else {
@ -178,7 +178,7 @@ class eta2InterpolationPosXY : public virtual eta2InterpolationBase,
: etaInterpolationBase(nx, ny, ns, nsy, nb, nby, emin, emax),
eta2InterpolationBase(nx, ny, ns, nsy, nb, nby, emin, emax),
etaInterpolationPosXY(nx, ny, ns, nsy, nb, nby, emin, emax){
// cout << "e2pxy " << nb << " " << emin << " " << emax << endl;
// std::cout << "e2pxy " << nb << " " << emin << " " << emax << std::endl;
};
eta2InterpolationPosXY(eta2InterpolationPosXY *orig)
@ -198,8 +198,8 @@ class eta3InterpolationPosXY : public virtual eta3InterpolationBase,
: etaInterpolationBase(nx, ny, ns, nsy, nb, nby, emin, emax),
eta3InterpolationBase(nx, ny, ns, nsy, nb, nby, emin, emax),
etaInterpolationPosXY(nx, ny, ns, nsy, nb, nby, emin, emax){
// cout << "e3pxy " << nbeta << " " << etamin << " " << etamax
// << " " << nSubPixels<< endl;
// std::cout << "e3pxy " << nbeta << " " << etamin << " " << etamax
// << " " << nSubPixels<< std::endl;
};
eta3InterpolationPosXY(eta3InterpolationPosXY *orig)