Skip to content

Commit c3523c7

Browse files
author
Maurice Coquet
committed
clang format
1 parent c318d90 commit c3523c7

File tree

4 files changed

+34
-40
lines changed

4 files changed

+34
-40
lines changed

‎PWGDQ/Core/MuonMatchingMlResponse.h‎

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
break; \
5151
}
5252

53-
5453
// Check if the index of mCachedIndices (index associated to a FEATURE)
5554
// matches the entry in EnumInputFeatures associated to this FEATURE
5655
// if so, the inputFeatures vector is filled with the FEATURE's value
@@ -268,27 +267,25 @@ class MlResponseMFTMuonMatch : public MlResponse<TypeOutputScore>
268267
{
269268
float inputFeature = 0.;
270269
switch (idx) {
271-
CHECK_AND_FILL_MFT_TRACK(xMFT,getX);
272-
CHECK_AND_FILL_MFT_TRACK(yMFT,getY);
273-
CHECK_AND_FILL_MFT_TRACK(qOverptMFT,getInvQPt);
274-
CHECK_AND_FILL_MFT_TRACK(tglMFT,getTanl);
275-
CHECK_AND_FILL_MFT_TRACK(phiMFT,getPhi);
276-
CHECK_AND_FILL_MFT_TRACK(chi2MFT,getTrackChi2);
277-
CHECK_AND_FILL_MUON_TRACK(xMCH,getX);
278-
CHECK_AND_FILL_MUON_TRACK(yMCH,getY);
279-
CHECK_AND_FILL_MUON_TRACK(qOverptMCH,getInvQPt);
280-
CHECK_AND_FILL_MUON_TRACK(tglMCH,getTanl);
281-
CHECK_AND_FILL_MUON_TRACK(phiMCH,getPhi);
282-
CHECK_AND_FILL_MUON_TRACK(chi2MCH,getTrackChi2);
283-
CHECK_AND_FILL_MUONGLOB_TRACK(chi2MCHMFT,chi2MatchMCHMFT);
284-
CHECK_AND_FILL_MUONGLOB_TRACK(chi2GlobMUON,chi2);
270+
CHECK_AND_FILL_MFT_TRACK(xMFT, getX);
271+
CHECK_AND_FILL_MFT_TRACK(yMFT, getY);
272+
CHECK_AND_FILL_MFT_TRACK(qOverptMFT, getInvQPt);
273+
CHECK_AND_FILL_MFT_TRACK(tglMFT, getTanl);
274+
CHECK_AND_FILL_MFT_TRACK(phiMFT, getPhi);
275+
CHECK_AND_FILL_MFT_TRACK(chi2MFT, getTrackChi2);
276+
CHECK_AND_FILL_MUON_TRACK(xMCH, getX);
277+
CHECK_AND_FILL_MUON_TRACK(yMCH, getY);
278+
CHECK_AND_FILL_MUON_TRACK(qOverptMCH, getInvQPt);
279+
CHECK_AND_FILL_MUON_TRACK(tglMCH, getTanl);
280+
CHECK_AND_FILL_MUON_TRACK(phiMCH, getPhi);
281+
CHECK_AND_FILL_MUON_TRACK(chi2MCH, getTrackChi2);
282+
CHECK_AND_FILL_MUONGLOB_TRACK(chi2MCHMFT, chi2MatchMCHMFT);
283+
CHECK_AND_FILL_MUONGLOB_TRACK(chi2GlobMUON, chi2);
285284
CHECK_AND_FILL_MFTMUON_COLLISION(posZ);
286285
}
287286
return inputFeature;
288287
}
289288

290-
291-
292289
template <typename T1>
293290
float returnFeatureTest(uint8_t idx, T1 const& muon)
294291
{
@@ -335,7 +332,6 @@ class MlResponseMFTMuonMatch : public MlResponse<TypeOutputScore>
335332
return inputFeatures;
336333
}
337334

338-
339335
/// Method to get the value of variable chosen for binning
340336
/// \param track is the single track, \param collision is the collision
341337
/// \return binning variable

‎PWGDQ/Core/VarManager.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -950,7 +950,6 @@ class VarManager : public TObject
950950
return fgzMatching;
951951
}
952952

953-
954953
// Setup the 2 prong KFParticle
955954
static void SetupTwoProngKFParticle(float magField)
956955
{
@@ -1412,7 +1411,6 @@ o2::track::TrackParCovFwd VarManager::PropagateFwd(const T& track, const C& cov,
14121411
o2::track::TrackParCovFwd fwdtrack = FwdToTrackPar(track, cov);
14131412
fwdtrack.propagateToZhelix(z, fgMagField);
14141413
return fwdtrack;
1415-
14161414
}
14171415

14181416
template <uint32_t fillMap, typename T, typename C>

‎PWGDQ/TableProducer/tableMakerMC_withAssoc.cxx‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -939,14 +939,14 @@ struct TableMakerMC {
939939
if (static_cast<int>(muon.trackType()) < 2) {
940940
auto muonID = muon.matchMCHTrackId();
941941
auto muontrack = muon.template matchMCHTrack_as<TMuons>();
942-
auto muonprop = VarManager::PropagateMuon(muontrack, collision, VarManager::kToMatching);
942+
auto muonprop = VarManager::PropagateMuon(muontrack, collision, VarManager::kToMatching);
943943
auto mfttrack = muon.template matchMFTTrack_as<TMFTTracks>();
944-
auto const& mfttrackcov = mfCovs.rawIteratorAt(map_mfttrackcovs[mfttrack.globalIndex()]);
944+
auto const& mfttrackcov = mfCovs.rawIteratorAt(map_mfttrackcovs[mfttrack.globalIndex()]);
945945
o2::track::TrackParCovFwd mftprop = VarManager::PropagateFwd(mfttrack, mfttrackcov, VarManager::GetMatchingPlane());
946-
std::vector<float> output;
947-
std::vector<float> inputML = matchingMlResponse.getInputFeaturesGlob(muon, muonprop, mftprop, mfttrackcov, collision);
948-
matchingMlResponse.isSelectedMl(inputML, 0, output);
949-
float score = output[0];
946+
std::vector<float> output;
947+
std::vector<float> inputML = matchingMlResponse.getInputFeaturesGlob(muon, muonprop, mftprop, mfttrackcov, collision);
948+
matchingMlResponse.isSelectedMl(inputML, 0, output);
949+
float score = output[0];
950950
if (mCandidates.find(muonID) == mCandidates.end()) {
951951
mCandidates[muonID] = {score, muon.globalIndex()};
952952
} else {
@@ -1186,7 +1186,7 @@ struct TableMakerMC {
11861186
fGrpMag = fCCDB->getForTimeStamp<o2::parameters::GRPMagField>(fConfigCCDB.fGrpMagPath, bcs.begin().timestamp());
11871187
if (fGrpMag != nullptr) {
11881188
o2::base::Propagator::initFieldFromGRP(fGrpMag);
1189-
VarManager::SetMagneticField(fGrpMag->getNominalL3Field());
1189+
VarManager::SetMagneticField(fGrpMag->getNominalL3Field());
11901190
}
11911191
if (fConfigVariousOptions.fPropMuon) {
11921192
VarManager::SetupMuonMagField();
@@ -1277,13 +1277,13 @@ struct TableMakerMC {
12771277
if constexpr (static_cast<bool>(TMFTFillMap)) {
12781278
auto groupedMuonIndices = fwdTrackAssocs.sliceBy(fwdtrackIndicesPerCollision, origIdx);
12791279
if (fConfigVariousOptions.fKeepBestMatch) {
1280-
if constexpr (static_cast<bool>(TMFTFillMap & VarManager::ObjTypes::MFTCov)) {
1281-
if (fConfigVariousOptions.fUseML.value) {
1282-
skimBestMuonMatchesML(muons, mftTracks, mftCovs, collision);
1283-
}
1284-
} else {
1285-
skimBestMuonMatches(muons);
1286-
}
1280+
if constexpr (static_cast<bool>(TMFTFillMap & VarManager::ObjTypes::MFTCov)) {
1281+
if (fConfigVariousOptions.fUseML.value) {
1282+
skimBestMuonMatchesML(muons, mftTracks, mftCovs, collision);
1283+
}
1284+
} else {
1285+
skimBestMuonMatches(muons);
1286+
}
12871287
}
12881288
if constexpr (static_cast<bool>(TMFTFillMap & VarManager::ObjTypes::MFTCov)) {
12891289
skimMuons<TMuonFillMap, TMFTFillMap>(collision, muons, groupedMuonIndices, mcParticles, mftTracks, mftCovs);

‎PWGDQ/TableProducer/tableMaker_withAssoc.cxx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1423,7 +1423,7 @@ struct TableMaker {
14231423
fGrpMag = fCCDB->getForTimeStamp<o2::parameters::GRPMagField>(fConfigCCDB.fConfigGrpMagPath, bcs.begin().timestamp());
14241424
if (fGrpMag != nullptr) {
14251425
o2::base::Propagator::initFieldFromGRP(fGrpMag);
1426-
VarManager::SetMagneticField(fGrpMag->getNominalL3Field());
1426+
VarManager::SetMagneticField(fGrpMag->getNominalL3Field());
14271427
}
14281428
if (fConfigVariousOptions.fPropMuon) {
14291429
VarManager::SetupMuonMagField();
@@ -1501,13 +1501,13 @@ struct TableMaker {
15011501
if constexpr (static_cast<bool>(TMFTFillMap)) {
15021502
auto groupedMuonIndices = fwdTrackAssocs.sliceBy(fwdtrackIndicesPerCollision, origIdx);
15031503
if (fConfigVariousOptions.fKeepBestMatch) {
1504-
if constexpr (static_cast<bool>(TMFTFillMap & VarManager::ObjTypes::MFTCov)) {
1505-
if (fConfigVariousOptions.fUseML.value) {
1504+
if constexpr (static_cast<bool>(TMFTFillMap & VarManager::ObjTypes::MFTCov)) {
1505+
if (fConfigVariousOptions.fUseML.value) {
15061506
skimBestMuonMatchesML(muons, mftTracks, mftCovs, collision);
1507-
}
1508-
} else {
1509-
skimBestMuonMatches(muons);
15101507
}
1508+
} else {
1509+
skimBestMuonMatches(muons);
1510+
}
15111511
}
15121512
if constexpr (static_cast<bool>(TMFTFillMap & VarManager::ObjTypes::MFTCov)) {
15131513
skimMuons<TMuonFillMap, TMFTFillMap>(collision, bcs, muons, groupedMuonIndices, mftTracks, mftCovs);

0 commit comments

Comments
 (0)