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

Solved problem in photon finder

Browse Source
This commit is contained in:
redford_s 2022-03-25 18:20:32 +01:00
parent 2fe24c108b
commit ea1222ac5b
2 changed files with 33 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
slsDetectorCalibration/singlePhotonDetector.h
View File

@ -429,10 +429,15 @@ class singlePhotonDetector : public analogDetector<uint16_t> {
for (ic = -(clusterSize / 2); ic < (clusterSize / 2) + 1;
ic++) {
if ((iy + ir) >= iy && (iy + ir) < ny &&
(ix + ic) >= ix && (ix + ic) < nx) {
if ((iy + ir) >= 0 && (iy + ir) < ny &&
(ix + ic) >= 0 && (ix + ic) < nx) {
if ((iy + ir) >= iy && (ix + ic) >= ix ) {
val[(iy + ir) * nx + ix + ic] =
subtractPedestal(data, ix + ic, iy + ir, cm);
}
v = &(val[(iy + ir) * nx + ix + ic]);
tot += *v;
if (ir <= 0 && ic <= 0)
@ -443,9 +448,9 @@ class singlePhotonDetector : public analogDetector<uint16_t> {
tl += *v;
if (ir >= 0 && ic >= 0)
tr += *v;
if (*v > max) {
if (*v > max) //{
max = *v;
}
//}
}
}
}
@ -513,12 +518,19 @@ class singlePhotonDetector : public analogDetector<uint16_t> {
for (ic = -(clusterSize / 2);
ic < (clusterSize / 2) + 1; ic++) {
if ((iy + ir) >= 0 && (iy + ir) < ny &&
(ix + ic) >= 0 && (ix + ic) < nx)
(ix + ic) >= 0 && (ix + ic) < nx) {
(clusters + nph)
->set_data(val[(iy + ir) * nx + ix + ic],
ic, ir);
if (val[(iy + ir) * nx + ix + ic]>max)
good=0;
}
}
}
if (good==0) {
(clusters + nph)->print();
cout << max << " " << val[iy * nx + ix] << endl;
}
good = 1;
if (eMin > 0 && tot < eMin)
good = 0;

4
slsDetectorCalibration/single_photon_hit.h
View File

@ -216,14 +216,18 @@ class single_photon_hit {
// int ix, iy;
printf("***************\n");
printf("** %d %d **\n",x,y);
for (int iy = 0; iy < dy; iy++) {
for (int ix = 0; ix < dx; ix++) {
printf("%d \t", data[ix + iy * dx]);
}
printf("\n");
}
printf("***************\n");
}
/**
assign the value to the element of the cluster matrix, with relative
coordinates where the center of the cluster is (0,0) \param v value to be