Skip to content

GPU QA: Fix incorrect use of lock when duping to ROOT file #16117

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

Open
davidrohr wants to merge 1 commit into
base: dev
Choose a base branch
from
+5 −5
Open

GPU QA: Fix incorrect use of lock when duping to ROOT file #16117

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
4 changes: 2 additions & 2 deletions GPU/GPUTracking/Debug/GPUROOTDump.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ class GPUROOTDump<T, Args...> : public GPUROOTDump<Args...>
void FillInternal(const T& o, const Args&... args)
{
mObj = o;
GPUROOTDump<Args...>::Fill(args...);
GPUROOTDump<Args...>::FillInternal(args...);
}

using GPUROOTDump<Args...>::mTree;
Expand All @@ -101,7 +101,7 @@ class GPUROOTDump<> : public GPUROOTDumpBase
void write() override { mTree->Write(); }

protected:
void Fill()
void FillInternal()
{
mTree->Fill();
}
Expand Down
2 changes: 1 addition & 1 deletion GPU/GPUTracking/Definitions/GPUSettingsList.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,7 @@ AddOption(filterCharge, int32_t, 0, "", 0, "Filter for positive (+1) or negative
AddOption(filterPID, int32_t, -1, "", 0, "Filter for Particle Type (0 Electron, 1 Muon, 2 Pion, 3 Kaon, 4 Proton)")
AddOption(nativeFitResolutions, bool, false, "", 0, "Create resolution histograms in the native fit units (sin(phi), tan(lambda), Q/Pt)")
AddOption(enableLocalOutput, bool, true, "", 0, "Enable normal output to local PDF files / console")
AddOption(dumpToROOTLevel, int32_t, -1, "", 0, "Dump all clusters and tracks to a ROOT file, 1 = combined TNTUple dump, 2 = also individual cluster / track branch dump", def(1))
AddOption(dumpToROOTLevel, int32_t, -1, "", 0, "Dump all clusters and tracks to a ROOT file, 1 = tracks, 2 = efficeiencies, 3 = clusters with attached tracks", def(1))
AddOption(writeFileExt, std::string, "", "", 0, "Write extra output file with given extension (default ROOT Canvas)", def("root"))
AddOption(writeMCLabels, bool, false, "", 0, "Store mc labels to file for later matching")
AddOptionVec(matchMCLabels, std::string, "", 0, "Read labels from files and match them, only process tracks where labels differ")
Expand Down
4 changes: 2 additions & 2 deletions GPU/GPUTracking/qa/GPUQA.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1315,7 +1315,7 @@ void GPUQA::RunQA(bool matchOnly, const std::vector<o2::tpc::TrackTPC>* tracksEx
float s = std::sin(alpha);
float localY = -info.x * s + info.y * c;

if (mConfig.dumpToROOTLevel >= 1) {
if (mConfig.dumpToROOTLevel >= 2) {
static auto effdump = GPUROOTDump<TNtuple>::getNew("eff", "alpha:x:y:z:mcphi:mceta:mcpt:rec:fake:findable:prim:ncls");
float localX = info.x * c + info.y * s;
effdump.Fill(alpha, localX, localY, info.z, mcphi, mceta, mcpt, mRecTracks[iCol][i], mFakeTracks[iCol][i], findable, info.prim, mc2.nWeightCls);
Expand Down Expand Up @@ -1978,7 +1978,7 @@ void GPUQA::RunQA(bool matchOnly, const std::vector<o2::tpc::TrackTPC>* tracksEx
}
uint32_t extState = mTracking->mIOPtrs.mergedTrackHitStates ? mTracking->mIOPtrs.mergedTrackHitStates[clid] : 0;

if (mConfig.dumpToROOTLevel >= 2) {
if (mConfig.dumpToROOTLevel >= 3) {
GPUTPCGMMergedTrack trk;
GPUTPCGMMergedTrackHit trkHit;
memset((void*)&trk, 0, sizeof(trk));
Expand Down
Loading