From a3586118c2487e79e956b2366a0c8f5d4398a9e7 Mon Sep 17 00:00:00 2001 From: ALICE Action Bot Date: Tue, 20 Feb 2024 09:19:01 +0000 Subject: [PATCH] MegaLinter fixes --- PWGUD/DataModel/UDTables.h | 2 +- PWGUD/Tasks/upcTauCentralBarrelRL.cxx | 71 ++++++++++++++------------- 2 files changed, 37 insertions(+), 36 deletions(-) diff --git a/PWGUD/DataModel/UDTables.h b/PWGUD/DataModel/UDTables.h index 33cbb4775d7..4b9746ef220 100644 --- a/PWGUD/DataModel/UDTables.h +++ b/PWGUD/DataModel/UDTables.h @@ -287,7 +287,7 @@ DECLARE_SOA_TABLE(UDTracksExtra, "AOD", "UDTRACKEXTRA", track::HasTRD, track::HasTOF, track::v001::ITSNCls, - track::v001::ITSClusterMap, + track::v001::ITSClusterMap, track::TPCNClsCrossedRows); DECLARE_SOA_TABLE(UDTracksDCA, "AOD", "UDTRACKDCA", diff --git a/PWGUD/Tasks/upcTauCentralBarrelRL.cxx b/PWGUD/Tasks/upcTauCentralBarrelRL.cxx index ae9801531ff..8f9d9884cdb 100644 --- a/PWGUD/Tasks/upcTauCentralBarrelRL.cxx +++ b/PWGUD/Tasks/upcTauCentralBarrelRL.cxx @@ -141,7 +141,7 @@ struct UpcTauCentralBarrelRL { Configurable cutMyGTdcaXYusePt{"cutMyGTdcaXYusePt", false, {"MyGlobalTrack cut"}}; Configurable cutMyGTitsNClsMin{"cutMyGTitsNClsMin", 1, {"MyGlobalTrack cut"}}; Configurable cutMyGTitsChi2NclMax{"cutMyGTitsChi2NclMax", 36.f, {"MyGlobalTrack cut"}}; - Configurable cutMyGTitsHitsRule{"cutMyGTitsHitsRule", 0, {"MyGlobalTrack cut"}}; + Configurable cutMyGTitsHitsRule{"cutMyGTitsHitsRule", 0, {"MyGlobalTrack cut"}}; Configurable cutMyGTtpcNClsMin{"cutMyGTtpcNClsMin", 1, {"MyGlobalTrack cut"}}; Configurable cutMyGTtpcNClsCrossedRowsMin{"cutMyGTtpcNClsCrossedRowsMin", 70, {"MyGlobalTrack cut"}}; Configurable cutMyGTtpcNClsCrossedRowsOverNClsMin{"cutMyGTtpcNClsCrossedRowsOverNClsMin", 0.8f, {"MyGlobalTrack cut"}}; @@ -154,7 +154,7 @@ struct UpcTauCentralBarrelRL { // init void init(InitContext&) { - mySetITShitsRule(cutMyGTitsHitsRule); + mySetITShitsRule(cutMyGTitsHitsRule); if (verboseInfo) printLargeMessage("INIT METHOD"); @@ -421,36 +421,37 @@ struct UpcTauCentralBarrelRL { } // end run - std::vector>> cutMyRequiredITSHits{}; - - void mySetRequireHitsInITSLayers(int8_t minNRequiredHits, std::set requiredLayers) - { - // layer 0 corresponds to the the innermost ITS layer - cutMyRequiredITSHits.push_back(std::make_pair(minNRequiredHits, requiredLayers)); - } - - void mySetITShitsRule(int matching){ - switch (matching) { - case 0: //Run3ITSibAny - mySetRequireHitsInITSLayers(1, {0, 1, 2}); - break; - case 1: //Run3ITSibTwo - mySetRequireHitsInITSLayers(2, {0, 1, 2}); - break; - case 2: //Run3ITSallAny - mySetRequireHitsInITSLayers(1, {0, 1, 2, 3, 4, 5, 6}); - break; - case 3: //Run3ITSall7Layers - mySetRequireHitsInITSLayers(7, {0, 1, 2, 3, 4, 5, 6}); - break; - default: - LOG(fatal) << "You chose wrong ITS matching"; - break; - } - } - - bool isFulfillsITSHitRequirementsReinstatement(uint8_t itsClusterMap) const - { + std::vector>> cutMyRequiredITSHits{}; + + void mySetRequireHitsInITSLayers(int8_t minNRequiredHits, std::set requiredLayers) + { + // layer 0 corresponds to the the innermost ITS layer + cutMyRequiredITSHits.push_back(std::make_pair(minNRequiredHits, requiredLayers)); + } + + void mySetITShitsRule(int matching) + { + switch (matching) { + case 0: // Run3ITSibAny + mySetRequireHitsInITSLayers(1, {0, 1, 2}); + break; + case 1: // Run3ITSibTwo + mySetRequireHitsInITSLayers(2, {0, 1, 2}); + break; + case 2: // Run3ITSallAny + mySetRequireHitsInITSLayers(1, {0, 1, 2, 3, 4, 5, 6}); + break; + case 3: // Run3ITSall7Layers + mySetRequireHitsInITSLayers(7, {0, 1, 2, 3, 4, 5, 6}); + break; + default: + LOG(fatal) << "You chose wrong ITS matching"; + break; + } + } + + bool isFulfillsITSHitRequirementsReinstatement(uint8_t itsClusterMap) const + { constexpr uint8_t bit = 1; for (auto& itsRequirement : cutMyRequiredITSHits) { auto hits = std::count_if(itsRequirement.second.begin(), itsRequirement.second.end(), [&](auto&& requiredLayer) { return itsClusterMap & (bit << requiredLayer); }); @@ -461,7 +462,7 @@ struct UpcTauCentralBarrelRL { } } return true; - } + } template bool isGlobalTrackReinstatement(T const& track) @@ -492,8 +493,8 @@ struct UpcTauCentralBarrelRL { return false; if (track.itsChi2NCl() > cutMyGTitsChi2NclMax) return false; - if (!isFulfillsITSHitRequirementsReinstatement(track.itsClusterMap())) - return false; + if (!isFulfillsITSHitRequirementsReinstatement(track.itsClusterMap())) + return false; // TPC if (!track.hasTPC()) return false; // TPC refit