Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 5 additions & 3 deletions PWGEM/Dilepton/TableProducer/skimmerPrimaryMuon.cxx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2019-2020 CERN and copyright holders of ALICE O2.

Check failure on line 1 in PWGEM/Dilepton/TableProducer/skimmerPrimaryMuon.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/workflow-file]

Name of a workflow file must match the name of the main struct in it (without the PWG prefix). (Class implementation files should be in "Core" directories.)

Check failure on line 1 in PWGEM/Dilepton/TableProducer/skimmerPrimaryMuon.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-task]

Specify task name only when it cannot be derived from the struct name. Only append to the default name.
// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
// All rights not expressly granted are reserved.
//
Expand Down Expand Up @@ -67,7 +67,7 @@
Produces<aod::EMPrimaryMuonsCov> emprimarymuonscov;

// Configurables
Configurable<std::string> ccdburl{"ccdb-url", "http://alice-ccdb.cern.ch", "url of the ccdb repository"};

Check failure on line 70 in PWGEM/Dilepton/TableProducer/skimmerPrimaryMuon.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/configurable]

Use lowerCamelCase for names of configurables and use the same name for the struct member as for the JSON string. (Declare the type and names on the same line.)
Configurable<std::string> grpmagPath{"grpmagPath", "GLO/Config/GRPMagField", "CCDB path of the GRPMagField object"};
Configurable<std::string> geoPath{"geoPath", "GLO/Config/GeometryAligned", "Path of the geometry file"};
Configurable<bool> fillQAHistograms{"fillQAHistograms", false, "flag to fill QA histograms"};
Expand Down Expand Up @@ -1255,9 +1255,11 @@
if (global_muon.globalIndex() == muon.globalIndex()) { // don't store myself.
continue;
}
if (global_muon.collisionId() == muon.collisionId()) {
self_Ids.emplace_back(global_muon.globalIndex());
}
self_Ids.emplace_back(global_muon.globalIndex());

// if (global_muon.collisionId() == muon.collisionId()) {
// self_Ids.emplace_back(global_muon.globalIndex());
// }
}
em_same_mft_ids(self_Ids);
self_Ids.clear();
Expand All @@ -1271,7 +1273,7 @@
WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
{
return WorkflowSpec{
adaptAnalysisTask<skimmerPrimaryMuon>(cfgc, TaskName{"skimmer-primary-muon"}),

Check failure on line 1276 in PWGEM/Dilepton/TableProducer/skimmerPrimaryMuon.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-task]

Specified task name skimmer-primary-muon and the struct name skimmerPrimaryMuon produce the same device name skimmer-primary-muon. TaskName is redundant.
adaptAnalysisTask<associateAmbiguousMuon>(cfgc, TaskName{"associate-ambiguous-muon"}),

Check failure on line 1277 in PWGEM/Dilepton/TableProducer/skimmerPrimaryMuon.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-task]

Specified task name associate-ambiguous-muon and the struct name associateAmbiguousMuon produce the same device name associate-ambiguous-muon. TaskName is redundant.
adaptAnalysisTask<associateSameMFT>(cfgc, TaskName{"associate-same-mft"})};

Check failure on line 1278 in PWGEM/Dilepton/TableProducer/skimmerPrimaryMuon.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-task]

Device names associate-same-mft and associate-same-m-f-t generated from the specified task name associate-same-mft and from the struct name associateSameMFT, respectively, differ in hyphenation. Consider fixing capitalisation of the struct name to AssociateSameMft and removing TaskName.
}
5 changes: 4 additions & 1 deletion PWGEM/Dilepton/Utils/EMTrackUtilities.h
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,10 @@ bool isBestMatch(TTrack const& track, TCut const& cut, TTracks const& tracks)
}
}
}
if (map_chi2MCHMFT.begin()->first == track.globalIndex()) { // search for minimum matching-chi2

auto it = std::min_element(map_chi2MCHMFT.begin(), map_chi2MCHMFT.end(), [](decltype(map_chi2MCHMFT)::value_type& l, decltype(map_chi2MCHMFT)::value_type& r) -> bool { return l.second < r.second; }); // search for minimum matching-chi2

if (it->first == track.globalIndex()) {
map_chi2MCHMFT.clear();
return true;
} else {
Expand Down
Loading