Skip to content

Commit 4dae020

Browse files
committed
GPU QA: Fix incorrect use of lock when duping to ROOT file
1 parent f611478 commit 4dae020

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

‎GPU/GPUTracking/Debug/GPUROOTDump.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ class GPUROOTDump<T, Args...> : public GPUROOTDump<Args...>
7979
void FillInternal(const T& o, const Args&... args)
8080
{
8181
mObj = o;
82-
GPUROOTDump<Args...>::Fill(args...);
82+
GPUROOTDump<Args...>::FillInternal(args...);
8383
}
8484

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

103103
protected:
104-
void Fill()
104+
void FillInternal()
105105
{
106106
mTree->Fill();
107107
}

‎GPU/GPUTracking/Definitions/GPUSettingsList.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ AddOption(filterCharge, int32_t, 0, "", 0, "Filter for positive (+1) or negative
443443
AddOption(filterPID, int32_t, -1, "", 0, "Filter for Particle Type (0 Electron, 1 Muon, 2 Pion, 3 Kaon, 4 Proton)")
444444
AddOption(nativeFitResolutions, bool, false, "", 0, "Create resolution histograms in the native fit units (sin(phi), tan(lambda), Q/Pt)")
445445
AddOption(enableLocalOutput, bool, true, "", 0, "Enable normal output to local PDF files / console")
446-
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))
446+
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))
447447
AddOption(writeFileExt, std::string, "", "", 0, "Write extra output file with given extension (default ROOT Canvas)", def("root"))
448448
AddOption(writeMCLabels, bool, false, "", 0, "Store mc labels to file for later matching")
449449
AddOptionVec(matchMCLabels, std::string, "", 0, "Read labels from files and match them, only process tracks where labels differ")

‎GPU/GPUTracking/qa/GPUQA.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1315,7 +1315,7 @@ void GPUQA::RunQA(bool matchOnly, const std::vector<o2::tpc::TrackTPC>* tracksEx
13151315
float s = std::sin(alpha);
13161316
float localY = -info.x * s + info.y * c;
13171317

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

1981-
if (mConfig.dumpToROOTLevel >= 2) {
1981+
if (mConfig.dumpToROOTLevel >= 3) {
19821982
GPUTPCGMMergedTrack trk;
19831983
GPUTPCGMMergedTrackHit trkHit;
19841984
memset((void*)&trk, 0, sizeof(trk));

0 commit comments

Comments
 (0)