Skip to content

Commit 887e1ca

Browse files
ktfktf
committed
Fix deprecation warning
1 parent bc86495 commit 887e1ca

1 file changed

Lines changed: 31 additions & 31 deletions

File tree

‎GPU/GPUTracking/qa/GPUQA.cxx‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ int GPUQA::InitQACreateHistograms()
430430
for (int k = 0; k < 2; k++) {
431431
for (int l = 0; l < 5; l++) {
432432
for (int m = 0; m < 2; m++) {
433-
sprintf(name, "%s%s%s%sVs%s", m ? "eff" : "tracks", EFF_TYPES[i], FINDABLE_NAMES[j], PRIM_NAMES[k], VSPARAMETER_NAMES[l]);
433+
snprintf(name, 2048, "%s%s%s%sVs%s", m ? "eff" : "tracks", EFF_TYPES[i], FINDABLE_NAMES[j], PRIM_NAMES[k], VSPARAMETER_NAMES[l]);
434434
if (l == 4) {
435435
std::unique_ptr<double[]> binsPt{CreateLogAxis(AXIS_BINS[4], k == 0 ? PT_MIN_PRIM : AXES_MIN[4], AXES_MAX[4])};
436436
createHist(mEff[i][j][k][l][m], name, name, AXIS_BINS[l], binsPt.get());
@@ -451,8 +451,8 @@ int GPUQA::InitQACreateHistograms()
451451
if (mQATasks & taskTrackingRes) {
452452
for (int i = 0; i < 5; i++) {
453453
for (int j = 0; j < 5; j++) {
454-
sprintf(name, "rms_%s_vs_%s", VSPARAMETER_NAMES[i], VSPARAMETER_NAMES[j]);
455-
sprintf(fname, "mean_%s_vs_%s", VSPARAMETER_NAMES[i], VSPARAMETER_NAMES[j]);
454+
snprintf(name, 2048, "rms_%s_vs_%s", VSPARAMETER_NAMES[i], VSPARAMETER_NAMES[j]);
455+
snprintf(fname, 1024, "mean_%s_vs_%s", VSPARAMETER_NAMES[i], VSPARAMETER_NAMES[j]);
456456
if (j == 4) {
457457
std::unique_ptr<double[]> binsPt{CreateLogAxis(AXIS_BINS[4], mConfig.resPrimaries == 1 ? PT_MIN_PRIM : AXES_MIN[4], AXES_MAX[4])};
458458
createHist(mRes[i][j][0], name, name, AXIS_BINS[j], binsPt.get());
@@ -461,7 +461,7 @@ int GPUQA::InitQACreateHistograms()
461461
createHist(mRes[i][j][0], name, name, AXIS_BINS[j], AXES_MIN[j], AXES_MAX[j]);
462462
createHist(mRes[i][j][1], fname, fname, AXIS_BINS[j], AXES_MIN[j], AXES_MAX[j]);
463463
}
464-
sprintf(name, "res_%s_vs_%s", VSPARAMETER_NAMES[i], VSPARAMETER_NAMES[j]);
464+
snprintf(name, 2048, "res_%s_vs_%s", VSPARAMETER_NAMES[i], VSPARAMETER_NAMES[j]);
465465
const float* axis = mConfig.nativeFitResolutions ? RES_AXES_NATIVE : RES_AXES;
466466
const int nbins = i == 4 && mConfig.nativeFitResolutions ? (10 * RES_AXIS_BINS[0]) : RES_AXIS_BINS[0];
467467
if (j == 4) {
@@ -478,8 +478,8 @@ int GPUQA::InitQACreateHistograms()
478478
if (mQATasks & taskTrackingResPull) {
479479
for (int i = 0; i < 5; i++) {
480480
for (int j = 0; j < 5; j++) {
481-
sprintf(name, "pull_rms_%s_vs_%s", VSPARAMETER_NAMES[i], VSPARAMETER_NAMES[j]);
482-
sprintf(fname, "pull_mean_%s_vs_%s", VSPARAMETER_NAMES[i], VSPARAMETER_NAMES[j]);
481+
snprintf(name, 2048, "pull_rms_%s_vs_%s", VSPARAMETER_NAMES[i], VSPARAMETER_NAMES[j]);
482+
snprintf(fname, 1024, "pull_mean_%s_vs_%s", VSPARAMETER_NAMES[i], VSPARAMETER_NAMES[j]);
483483
if (j == 4) {
484484
std::unique_ptr<double[]> binsPt{CreateLogAxis(AXIS_BINS[4], AXES_MIN[4], AXES_MAX[4])};
485485
createHist(mPull[i][j][0], name, name, AXIS_BINS[j], binsPt.get());
@@ -488,7 +488,7 @@ int GPUQA::InitQACreateHistograms()
488488
createHist(mPull[i][j][0], name, name, AXIS_BINS[j], AXES_MIN[j], AXES_MAX[j]);
489489
createHist(mPull[i][j][1], fname, fname, AXIS_BINS[j], AXES_MIN[j], AXES_MAX[j]);
490490
}
491-
sprintf(name, "pull_%s_vs_%s", VSPARAMETER_NAMES[i], VSPARAMETER_NAMES[j]);
491+
snprintf(name, 2048, "pull_%s_vs_%s", VSPARAMETER_NAMES[i], VSPARAMETER_NAMES[j]);
492492
if (j == 4) {
493493
std::unique_ptr<double[]> binsPt{CreateLogAxis(AXIS_BINS[4], AXES_MIN[4], AXES_MAX[4])};
494494
createHist(mPull2[i][j], name, name, RES_AXIS_BINS[0], -PULL_AXIS, PULL_AXIS, AXIS_BINS[j], binsPt.get());
@@ -504,17 +504,17 @@ int GPUQA::InitQACreateHistograms()
504504
for (int i = 0; i < N_CLS_TYPE * N_CLS_HIST - 1; i++) {
505505
int ioffset = i >= (2 * N_CLS_HIST - 1) ? (2 * N_CLS_HIST - 1) : i >= N_CLS_HIST ? N_CLS_HIST : 0;
506506
int itype = i >= (2 * N_CLS_HIST - 1) ? 2 : i >= N_CLS_HIST ? 1 : 0;
507-
sprintf(name, "clusters%s%s", CLUSTER_NAMES_SHORT[i - ioffset], CLUSTER_TYPES[itype]);
507+
snprintf(name, 2048, "clusters%s%s", CLUSTER_NAMES_SHORT[i - ioffset], CLUSTER_TYPES[itype]);
508508
std::unique_ptr<double[]> binsPt{CreateLogAxis(AXIS_BINS[4], PT_MIN_CLUST, PT_MAX)};
509509
createHist(mClusters[i], name, name, AXIS_BINS[4], binsPt.get());
510510
}
511511
}
512512

513513
if (mQATasks & taskTrackStatistics) {
514514
// Create Tracks Histograms
515-
sprintf(name, "nclusters");
515+
snprintf(name, 2048, "nclusters");
516516
createHist(mNCl, name, name, 160, 0, 159);
517-
sprintf(name, "tracks");
517+
snprintf(name, 2048, "tracks");
518518
std::unique_ptr<double[]> binsPt{CreateLogAxis(AXIS_BINS[4], PT_MIN_CLUST, PT_MAX)};
519519
createHist(mTracks, name, name, AXIS_BINS[4], binsPt.get());
520520
createHist(mClXY, "clXY", "clXY", 1000, -250, 250, 1000, -250, 250);
@@ -1858,8 +1858,8 @@ int GPUQA::DrawQAHistograms(TObjArray* qcout)
18581858
if (mQATasks & taskTrackingEff) {
18591859
for (int ii = 0; ii < 6; ii++) {
18601860
int i = ii == 5 ? 4 : ii;
1861-
sprintf(fname, "eff_vs_%s_layout", VSPARAMETER_NAMES[ii]);
1862-
sprintf(name, "Efficiency versus %s", VSPARAMETER_NAMES[i]);
1861+
snprintf(fname, 1024, "eff_vs_%s_layout", VSPARAMETER_NAMES[ii]);
1862+
snprintf(name, 2048, "Efficiency versus %s", VSPARAMETER_NAMES[i]);
18631863
mCEff[ii] = createGarbageCollected<TCanvas>(fname, name, 0, 0, 700, 700. * 2. / 3.);
18641864
mCEff[ii]->cd();
18651865
float dy = 1. / 2.;
@@ -1885,11 +1885,11 @@ int GPUQA::DrawQAHistograms(TObjArray* qcout)
18851885
for (int ii = 0; ii < 7; ii++) {
18861886
int i = ii == 5 ? 4 : ii;
18871887
if (ii == 6) {
1888-
sprintf(fname, "res_integral_layout");
1889-
sprintf(name, "Integral Resolution");
1888+
snprintf(fname, 1024, "res_integral_layout");
1889+
snprintf(name, 2048, "Integral Resolution");
18901890
} else {
1891-
sprintf(fname, "res_vs_%s_layout", VSPARAMETER_NAMES[ii]);
1892-
sprintf(name, "Resolution versus %s", VSPARAMETER_NAMES[i]);
1891+
snprintf(fname, 1024, "res_vs_%s_layout", VSPARAMETER_NAMES[ii]);
1892+
snprintf(name, 2048, "Resolution versus %s", VSPARAMETER_NAMES[i]);
18931893
}
18941894
mCRes[ii] = createGarbageCollected<TCanvas>(fname, name, 0, 0, 700, 700. * 2. / 3.);
18951895
mCRes[ii]->cd();
@@ -1927,11 +1927,11 @@ int GPUQA::DrawQAHistograms(TObjArray* qcout)
19271927
int i = ii == 5 ? 4 : ii;
19281928

19291929
if (ii == 6) {
1930-
sprintf(fname, "pull_integral_layout");
1931-
sprintf(name, "Integral Pull");
1930+
snprintf(fname, 1024, "pull_integral_layout");
1931+
snprintf(name, 2048, "Integral Pull");
19321932
} else {
1933-
sprintf(fname, "pull_vs_%s_layout", VSPARAMETER_NAMES[ii]);
1934-
sprintf(name, "Pull versus %s", VSPARAMETER_NAMES[i]);
1933+
snprintf(fname, 1024, "pull_vs_%s_layout", VSPARAMETER_NAMES[ii]);
1934+
snprintf(name, 2048, "Pull versus %s", VSPARAMETER_NAMES[i]);
19351935
}
19361936
mCPull[ii] = createGarbageCollected<TCanvas>(fname, name, 0, 0, 700, 700. * 2. / 3.);
19371937
mCPull[ii]->cd();
@@ -1966,7 +1966,7 @@ int GPUQA::DrawQAHistograms(TObjArray* qcout)
19661966
// Create Canvas for Cluster Histos
19671967
if (mQATasks & taskClusterAttach) {
19681968
for (int i = 0; i < 3; i++) {
1969-
sprintf(fname, "clusters_%s_layout", CLUSTER_TYPES[i]);
1969+
snprintf(fname, 1024, "clusters_%s_layout", CLUSTER_TYPES[i]);
19701970
mCClust[i] = createGarbageCollected<TCanvas>(fname, CLUSTER_TITLES[i], 0, 0, 700, 700. * 2. / 3.);
19711971
mCClust[i]->cd();
19721972
mPClust[i] = createGarbageCollected<TPad>("p0", "", 0.0, 0.0, 1.0, 1.0);
@@ -2067,7 +2067,7 @@ int GPUQA::DrawQAHistograms(TObjArray* qcout)
20672067
e->Draw(k || l ? "same" : "");
20682068
if (j == 0) {
20692069
GetName(fname, k);
2070-
sprintf(name, "%s%s", fname, EFF_NAMES[l]);
2070+
snprintf(name, 2048, "%s%s", fname, EFF_NAMES[l]);
20712071
mLEff[ii]->AddEntry(e, name, "l");
20722072
}
20732073
if (ii == 5) {
@@ -2203,8 +2203,8 @@ int GPUQA::DrawQAHistograms(TObjArray* qcout)
22032203
if (mConfig.inputHistogramsOnly) {
22042204
dstIntegral = createGarbageCollected<TH1D>();
22052205
}
2206-
sprintf(fname, p ? "IntPull%s" : "IntRes%s", VSPARAMETER_NAMES[j]);
2207-
sprintf(name, p ? "%s Pull" : "%s Resolution", p || mConfig.nativeFitResolutions ? PARAMETER_NAMES_NATIVE[j] : PARAMETER_NAMES[j]);
2206+
snprintf(fname, 1024, p ? "IntPull%s" : "IntRes%s", VSPARAMETER_NAMES[j]);
2207+
snprintf(name, 2048, p ? "%s Pull" : "%s Resolution", p || mConfig.nativeFitResolutions ? PARAMETER_NAMES_NATIVE[j] : PARAMETER_NAMES[j]);
22082208
dstIntegral->SetName(fname);
22092209
dstIntegral->SetTitle(name);
22102210
}
@@ -2257,7 +2257,7 @@ int GPUQA::DrawQAHistograms(TObjArray* qcout)
22572257
for (int l = 0; l < 2; l++) {
22582258
TH1F* e = dst[l];
22592259
if (!mConfig.inputHistogramsOnly && k == 0) {
2260-
sprintf(name, p ? "%s Pull" : "%s Resolution", p || mConfig.nativeFitResolutions ? PARAMETER_NAMES_NATIVE[j] : PARAMETER_NAMES[j]);
2260+
snprintf(name, 2048, p ? "%s Pull" : "%s Resolution", p || mConfig.nativeFitResolutions ? PARAMETER_NAMES_NATIVE[j] : PARAMETER_NAMES[j]);
22612261
e->SetTitle(name);
22622262
e->SetStats(kFALSE);
22632263
if (tout) {
@@ -2299,9 +2299,9 @@ int GPUQA::DrawQAHistograms(TObjArray* qcout)
22992299
if (j == 0) {
23002300
GetName(fname, k);
23012301
if (p) {
2302-
sprintf(name, "%s%s", fname, l ? "Mean" : "Pull");
2302+
snprintf(name, 2048, "%s%s", fname, l ? "Mean" : "Pull");
23032303
} else {
2304-
sprintf(name, "%s%s", fname, l ? "Mean" : "Resolution");
2304+
snprintf(name, 2048, "%s%s", fname, l ? "Mean" : "Resolution");
23052305
}
23062306
leg->AddEntry(e, name, "l");
23072307
}
@@ -2520,7 +2520,7 @@ int GPUQA::DrawQAHistograms(TObjArray* qcout)
25202520
e->SetLineColor(colorNums[numColor++ % COLORCOUNT]);
25212521
e->Draw(j == end - 1 && k == 0 ? "" : "same");
25222522
GetName(fname, k);
2523-
sprintf(name, "%s%s", fname, CLUSTER_NAMES[j - begin]);
2523+
snprintf(name, 2048, "%s%s", fname, CLUSTER_NAMES[j - begin]);
25242524
mLClust[i]->AddEntry(e, name, "l");
25252525
}
25262526
}
@@ -2610,7 +2610,7 @@ int GPUQA::DrawQAHistograms(TObjArray* qcout)
26102610
e->SetLineColor(colorNums[k % COLORCOUNT]);
26112611
e->Draw(k == 0 ? "" : "same");
26122612
GetName(fname, k);
2613-
sprintf(name, "%sTrack Pt", fname);
2613+
snprintf(name, 2048, "%sTrack Pt", fname);
26142614
mLTracks->AddEntry(e, name, "l");
26152615
}
26162616
mLTracks->Draw();
@@ -2653,7 +2653,7 @@ int GPUQA::DrawQAHistograms(TObjArray* qcout)
26532653
e->SetLineColor(colorNums[k % COLORCOUNT]);
26542654
e->Draw(k == 0 ? "" : "same");
26552655
GetName(fname, k);
2656-
sprintf(name, "%sNClusters", fname);
2656+
snprintf(name, 2048, "%sNClusters", fname);
26572657
mLNCl->AddEntry(e, name, "l");
26582658
}
26592659
mLNCl->Draw();
@@ -2701,7 +2701,7 @@ void GPUQA::PrintClusterCount(int mode, int& num, const char* name, unsigned lon
27012701
// do nothing, just count num
27022702
} else if (mode == 1) {
27032703
char name2[128];
2704-
sprintf(name2, "clusterCount%d_", num);
2704+
snprintf(name2, 128, "clusterCount%d_", num);
27052705
char* ptr = name2 + strlen(name2);
27062706
for (unsigned int i = 0; i < strlen(name); i++) {
27072707
if ((name[i] >= 'a' && name[i] <= 'z') || (name[i] >= 'A' && name[i] <= 'Z') || (name[i] >= '0' && name[i] <= '9')) {

0 commit comments

Comments
 (0)