Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[131X] use qScale in charge reweighting #41708

Merged
merged 1 commit into from
May 20, 2023
+16 −1
Merged

[131X] use qScale in charge reweighting #41708

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion SimTracker/Common/interface/SiPixelChargeReweightingAlgorithm.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,6 +389,7 @@ inline int SiPixelChargeReweightingAlgorithm::PixelTempRewgt2D(int id_in, int id
int i, j, k, l, kclose;
int nclusx, nclusy, success;
float xsize, ysize, q50i, q100i, q50r, q10r, xhit2D, yhit2D, dist2, dmin2;
float qscalei, rqscale;
float xy_in[BXM2][BYM2], xy_rewgt[BXM2][BYM2], xy_clust[TXSIZE][TYSIZE];
int denx_clust[TXSIZE][TYSIZE], deny_clust[TXSIZE][TYSIZE];
float cotalpha, cotbeta;
Expand Down Expand Up @@ -452,6 +453,9 @@ inline int SiPixelChargeReweightingAlgorithm::PixelTempRewgt2D(int id_in, int id
//q50i = 0;
q100i = 2.f * q50i;

// save input charge scale (14/4/2023)
qscalei = templ2D.qscale();

// Check that the cluster container is a 13x21 matrix

if (cluster.num_dimensions() != 2) {
Expand Down Expand Up @@ -495,6 +499,9 @@ inline int SiPixelChargeReweightingAlgorithm::PixelTempRewgt2D(int id_in, int id
q50r = templ2D.s50();
q10r = 0.2f * q50r;

// calculate ratio of charge scaling factors (14/4/2023)
rqscale = qscalei/templ2D.qscale();

// Find all non-zero denominator pixels in the input template and generate "inside" weights

int ntpix = 0;
Expand Down Expand Up @@ -579,7 +586,15 @@ inline int SiPixelChargeReweightingAlgorithm::PixelTempRewgt2D(int id_in, int id
}
}
}


// final rescaling by the ratio of charge scaling factors (14/4/2023)
// put this here to avoid changing the threshold tests above and to be vectorizable
for (i = 0; i < TYSIZE; ++i) {
for (j = 0; j < TXSIZE; ++j) {
cluster[j][i] *= rqscale;
}
}

return success;
} // PixelTempRewgt2D

Expand Down