Skip to content

Enhance DCAFitterN::print, allow resetting log throttlers #13925

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

Merged
shahor02 merged 1 commit into from
Feb 3, 2025
Merged

Enhance DCAFitterN::print, allow resetting log throttlers #13925

Show file tree
Hide file tree
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: 15 additions & 2 deletions Common/DCAFitter/include/DCAFitter/DCAFitterN.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,13 @@ class DCAFitterN
pnt[2] = tr.getZ();
}

GPUdi() void clearLogThrottlers()
{
mLoggerBadCov.clear();
mLoggerBadInv.clear();
mLoggerBadProp.clear();
}

void setBadCovPolicy(BadCovPolicy v) { mBadCovPolicy = v; }
BadCovPolicy getBadCovPolicy() const { return mBadCovPolicy; }

Expand Down Expand Up @@ -1084,10 +1091,16 @@ template <int N, typename... Args>
GPUd() void DCAFitterN<N, Args...>::print() const
{
#ifndef GPUCA_GPUCODE_DEVICE
LOG(info) << N << "-prong vertex fitter in " << (mUseAbsDCA ? "abs." : "weighted") << " distance minimization mode";
LOG(info) << "Bz: " << mBz << " MaxIter: " << mMaxIter << " MaxChi2: " << mMaxChi2;
LOG(info) << N << "-prong vertex fitter in " << (mUseAbsDCA ? "abs." : "weighted") << " distance minimization mode, collinear tracks mode: " << (mIsCollinear ? "ON" : "OFF");
LOG(info) << "Bz: " << mBz << " MaxIter: " << mMaxIter << " MaxChi2: " << mMaxChi2 << " MatCorrType: " << int(mMatCorr);
LOG(info) << "Stopping condition: Max.param change < " << mMinParamChange << " Rel.Chi2 change > " << mMinRelChi2Change;
LOG(info) << "Discard candidates for : Rvtx > " << getMaxR() << " DZ between tracks > " << mMaxDZIni;
LOG(info) << "PropagateToPCA:" << mPropagateToPCA << " WeightedFinalPCA:" << mWeightedFinalPCA << " UsePropagator:" << mUsePropagator << " RefitWithMatCorr:" << mRefitWithMatCorr;
std::string rep{};
for (int i = 0; i < mCrossings.nDCA; i++) {
rep += fmt::format("seed{}:{}/{} ", i, mTrPropDone[i], mPropFailed[i]);
}
LOG(info) << "Last call: NCand:" << mCurHyp << " from " << mCrossings.nDCA << " seeds, prop.done/failed: " << rep;
#else
if (mUseAbsDCA) {
printf("%d-prong vertex fitter in abs. distance minimization mode\n", N);
Expand Down
6 changes: 5 additions & 1 deletion Common/DCAFitter/test/testDCAFitterN.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,7 @@ BOOST_AUTO_TEST_CASE(DCAFitterNProngs)
BOOST_CHECK(meanDA < 0.1);
BOOST_CHECK(meanDAW < 0.1);
BOOST_CHECK(meanDW < 0.1);
ft.print();
}

// 2 prongs vertices with collinear tracks (gamma conversion)
Expand Down Expand Up @@ -316,6 +317,7 @@ BOOST_AUTO_TEST_CASE(DCAFitterNProngs)
BOOST_CHECK(meanDA < 2.1);
BOOST_CHECK(meanDAW < 2.1);
BOOST_CHECK(meanDW < 2.1);
ft.print();
}

// 2 prongs vertices with one of charges set to 0: Helix : Line
Expand Down Expand Up @@ -394,6 +396,7 @@ BOOST_AUTO_TEST_CASE(DCAFitterNProngs)
BOOST_CHECK(meanDA < 0.1);
BOOST_CHECK(meanDAW < 0.1);
BOOST_CHECK(meanDW < 0.1);
ft.print();
}

// 2 prongs vertices with both of charges set to 0: Line : Line
Expand Down Expand Up @@ -471,6 +474,7 @@ BOOST_AUTO_TEST_CASE(DCAFitterNProngs)
BOOST_CHECK(meanDA < 0.1);
BOOST_CHECK(meanDAW < 0.1);
BOOST_CHECK(meanDW < 0.1);
ft.print();
}

// 3 prongs vertices
Expand Down Expand Up @@ -547,8 +551,8 @@ BOOST_AUTO_TEST_CASE(DCAFitterNProngs)
BOOST_CHECK(meanDA < 0.1);
BOOST_CHECK(meanDAW < 0.1);
BOOST_CHECK(meanDW < 0.1);
ft.print();
}

outStream.Close();
}

Expand Down