Skip to content

Commit c62cc3e

Browse files
authored
Merge pull request AliceO2Group#12 from alibuild/alibot-cleanup-ml-4778
[MegaLinter] Apply linters automatic fixes to AliceO2Group#4778
2 parents c56d7cc + a358611 commit c62cc3e

File tree

2 files changed

+37
-36
lines changed

2 files changed

+37
-36
lines changed

PWGUD/DataModel/UDTables.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ DECLARE_SOA_TABLE(UDTracksExtra, "AOD", "UDTRACKEXTRA",
287287
track::HasTRD<udtrack::DetectorMap>,
288288
track::HasTOF<udtrack::DetectorMap>,
289289
track::v001::ITSNCls<track::ITSClusterSizes>,
290-
track::v001::ITSClusterMap<track::ITSClusterSizes>,
290+
track::v001::ITSClusterMap<track::ITSClusterSizes>,
291291
track::TPCNClsCrossedRows<track::TPCNClsFindable, track::TPCNClsFindableMinusCrossedRows>);
292292

293293
DECLARE_SOA_TABLE(UDTracksDCA, "AOD", "UDTRACKDCA",

PWGUD/Tasks/upcTauCentralBarrelRL.cxx

Lines changed: 36 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ struct UpcTauCentralBarrelRL {
141141
Configurable<bool> cutMyGTdcaXYusePt{"cutMyGTdcaXYusePt", false, {"MyGlobalTrack cut"}};
142142
Configurable<int> cutMyGTitsNClsMin{"cutMyGTitsNClsMin", 1, {"MyGlobalTrack cut"}};
143143
Configurable<float> cutMyGTitsChi2NclMax{"cutMyGTitsChi2NclMax", 36.f, {"MyGlobalTrack cut"}};
144-
Configurable<int> cutMyGTitsHitsRule{"cutMyGTitsHitsRule", 0, {"MyGlobalTrack cut"}};
144+
Configurable<int> cutMyGTitsHitsRule{"cutMyGTitsHitsRule", 0, {"MyGlobalTrack cut"}};
145145
Configurable<int> cutMyGTtpcNClsMin{"cutMyGTtpcNClsMin", 1, {"MyGlobalTrack cut"}};
146146
Configurable<int> cutMyGTtpcNClsCrossedRowsMin{"cutMyGTtpcNClsCrossedRowsMin", 70, {"MyGlobalTrack cut"}};
147147
Configurable<float> cutMyGTtpcNClsCrossedRowsOverNClsMin{"cutMyGTtpcNClsCrossedRowsOverNClsMin", 0.8f, {"MyGlobalTrack cut"}};
@@ -154,7 +154,7 @@ struct UpcTauCentralBarrelRL {
154154
// init
155155
void init(InitContext&)
156156
{
157-
mySetITShitsRule(cutMyGTitsHitsRule);
157+
mySetITShitsRule(cutMyGTitsHitsRule);
158158

159159
if (verboseInfo)
160160
printLargeMessage("INIT METHOD");
@@ -421,36 +421,37 @@ struct UpcTauCentralBarrelRL {
421421

422422
} // end run
423423

424-
std::vector<std::pair<int8_t, std::set<uint8_t>>> cutMyRequiredITSHits{};
425-
426-
void mySetRequireHitsInITSLayers(int8_t minNRequiredHits, std::set<uint8_t> requiredLayers)
427-
{
428-
// layer 0 corresponds to the the innermost ITS layer
429-
cutMyRequiredITSHits.push_back(std::make_pair(minNRequiredHits, requiredLayers));
430-
}
431-
432-
void mySetITShitsRule(int matching){
433-
switch (matching) {
434-
case 0: //Run3ITSibAny
435-
mySetRequireHitsInITSLayers(1, {0, 1, 2});
436-
break;
437-
case 1: //Run3ITSibTwo
438-
mySetRequireHitsInITSLayers(2, {0, 1, 2});
439-
break;
440-
case 2: //Run3ITSallAny
441-
mySetRequireHitsInITSLayers(1, {0, 1, 2, 3, 4, 5, 6});
442-
break;
443-
case 3: //Run3ITSall7Layers
444-
mySetRequireHitsInITSLayers(7, {0, 1, 2, 3, 4, 5, 6});
445-
break;
446-
default:
447-
LOG(fatal) << "You chose wrong ITS matching";
448-
break;
449-
}
450-
}
451-
452-
bool isFulfillsITSHitRequirementsReinstatement(uint8_t itsClusterMap) const
453-
{
424+
std::vector<std::pair<int8_t, std::set<uint8_t>>> cutMyRequiredITSHits{};
425+
426+
void mySetRequireHitsInITSLayers(int8_t minNRequiredHits, std::set<uint8_t> requiredLayers)
427+
{
428+
// layer 0 corresponds to the the innermost ITS layer
429+
cutMyRequiredITSHits.push_back(std::make_pair(minNRequiredHits, requiredLayers));
430+
}
431+
432+
void mySetITShitsRule(int matching)
433+
{
434+
switch (matching) {
435+
case 0: // Run3ITSibAny
436+
mySetRequireHitsInITSLayers(1, {0, 1, 2});
437+
break;
438+
case 1: // Run3ITSibTwo
439+
mySetRequireHitsInITSLayers(2, {0, 1, 2});
440+
break;
441+
case 2: // Run3ITSallAny
442+
mySetRequireHitsInITSLayers(1, {0, 1, 2, 3, 4, 5, 6});
443+
break;
444+
case 3: // Run3ITSall7Layers
445+
mySetRequireHitsInITSLayers(7, {0, 1, 2, 3, 4, 5, 6});
446+
break;
447+
default:
448+
LOG(fatal) << "You chose wrong ITS matching";
449+
break;
450+
}
451+
}
452+
453+
bool isFulfillsITSHitRequirementsReinstatement(uint8_t itsClusterMap) const
454+
{
454455
constexpr uint8_t bit = 1;
455456
for (auto& itsRequirement : cutMyRequiredITSHits) {
456457
auto hits = std::count_if(itsRequirement.second.begin(), itsRequirement.second.end(), [&](auto&& requiredLayer) { return itsClusterMap & (bit << requiredLayer); });
@@ -461,7 +462,7 @@ struct UpcTauCentralBarrelRL {
461462
}
462463
}
463464
return true;
464-
}
465+
}
465466

466467
template <typename T>
467468
bool isGlobalTrackReinstatement(T const& track)
@@ -492,8 +493,8 @@ struct UpcTauCentralBarrelRL {
492493
return false;
493494
if (track.itsChi2NCl() > cutMyGTitsChi2NclMax)
494495
return false;
495-
if (!isFulfillsITSHitRequirementsReinstatement(track.itsClusterMap()))
496-
return false;
496+
if (!isFulfillsITSHitRequirementsReinstatement(track.itsClusterMap()))
497+
return false;
497498
// TPC
498499
if (!track.hasTPC())
499500
return false; // TPC refit

0 commit comments

Comments
 (0)