Skip to content

Commit e26a98d

Browse files
alibuildalibuild
committed
Please consider the following formatting changes
1 parent b7573ab commit e26a98d

3 files changed

Lines changed: 39 additions & 45 deletions

File tree

‎PWGDQ/Core/VarManager.h‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
#include "Common/CCDB/TriggerAliases.h"
2929
#include "Common/Core/CollisionTypeHelper.h"
3030
#include "Common/Core/EventPlaneHelper.h"
31-
#include "Common/Core/trackUtilities.h"
3231
#include "Common/Core/fwdtrackUtilities.h"
32+
#include "Common/Core/trackUtilities.h"
3333

3434
#include "CommonConstants/LHCConstants.h"
3535
#include "CommonConstants/PhysicsConstants.h"
@@ -1481,12 +1481,6 @@ void VarManager::FillGlobalMuonRefit(T1 const& muontrack, T2 const& mfttrack, co
14811481
}
14821482
}
14831483

1484-
1485-
1486-
1487-
1488-
1489-
14901484
template <uint32_t MuonfillMap, uint32_t MFTfillMap, typename T1, typename T2, typename C, typename C2>
14911485
void VarManager::FillGlobalMuonRefitCov(T1 const& muontrack, T2 const& mfttrack, const C& collision, C2 const& mftcov, float* values)
14921486
{
@@ -1498,12 +1492,12 @@ void VarManager::FillGlobalMuonRefitCov(T1 const& muontrack, T2 const& mfttrack,
14981492
o2::dataformats::GlobalFwdTrack propmuon = PropagateMuon(muontrack, collision);
14991493
SMatrix5 tpars(mfttrack.x(), mfttrack.y(), mfttrack.phi(), mfttrack.tgl(), mfttrack.signed1Pt());
15001494
std::vector<double> v1{mftcov.cXX(), mftcov.cXY(), mftcov.cYY(), mftcov.cPhiX(), mftcov.cPhiY(),
1501-
mftcov.cPhiPhi(), mftcov.cTglX(), mftcov.cTglY(), mftcov.cTglPhi(), mftcov.cTglTgl(),
1502-
mftcov.c1PtX(), mftcov.c1PtY(), mftcov.c1PtPhi(), mftcov.c1PtTgl(), mftcov.c1Pt21Pt2()};
1495+
mftcov.cPhiPhi(), mftcov.cTglX(), mftcov.cTglY(), mftcov.cTglPhi(), mftcov.cTglTgl(),
1496+
mftcov.c1PtX(), mftcov.c1PtY(), mftcov.c1PtPhi(), mftcov.c1PtTgl(), mftcov.c1Pt21Pt2()};
15031497
SMatrix55 tcovs(v1.begin(), v1.end());
15041498
o2::track::TrackParCovFwd mft{mfttrack.z(), tpars, tcovs, mfttrack.chi2()};
15051499

1506-
o2::dataformats::GlobalFwdTrack globalRefit = o2::aod::fwdtrackutils::refitGlobalMuonCov(propmuon,mft);
1500+
o2::dataformats::GlobalFwdTrack globalRefit = o2::aod::fwdtrackutils::refitGlobalMuonCov(propmuon, mft);
15071501
values[kX] = globalRefit.getX();
15081502
values[kY] = globalRefit.getY();
15091503
values[kZ] = globalRefit.getZ();

‎PWGDQ/TableProducer/tableMakerMC_withAssoc.cxx‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -238,14 +238,14 @@ struct TableMakerMC {
238238
std::map<uint32_t, uint32_t> fMftIndexMap; // key: MFT tracklet global index, value: new MFT tracklet global index
239239

240240
std::map<uint32_t, bool> fBestMatch;
241-
std::unordered_map<int64_t,int32_t> map_mfttrackcovs;
241+
std::unordered_map<int64_t, int32_t> map_mfttrackcovs;
242242

243243
void init(o2::framework::InitContext& context)
244244
{
245245
// Check whether barrel or muon are enabled
246246
bool isProcessBCenabled = context.mOptions.get<bool>("processPP");
247247
bool isBarrelEnabled = (context.mOptions.get<bool>("processPP") || context.mOptions.get<bool>("processPPBarrelOnly") || context.mOptions.get<bool>("processPbPbBarrelOnly") || context.mOptions.get<bool>("processPbPbWithFilterBarrelOnly"));
248-
bool isMuonEnabled = (context.mOptions.get<bool>("processPP") || context.mOptions.get<bool>("processPPMuonOnlyBasic") || context.mOptions.get<bool>("processPPMuonOnly") || context.mOptions.get<bool>("processPPRealignedMuonOnly") || context.mOptions.get<bool>("processPbPbMuonOnly") || context.mOptions.get<bool>("processPbPbRealignedMuonOnly")) ||context.mOptions.get<bool>("processPPMuonRefit");
248+
bool isMuonEnabled = (context.mOptions.get<bool>("processPP") || context.mOptions.get<bool>("processPPMuonOnlyBasic") || context.mOptions.get<bool>("processPPMuonOnly") || context.mOptions.get<bool>("processPPRealignedMuonOnly") || context.mOptions.get<bool>("processPbPbMuonOnly") || context.mOptions.get<bool>("processPbPbRealignedMuonOnly")) || context.mOptions.get<bool>("processPPMuonRefit");
249249
// Make sure at least one process function is enabled
250250
if (!(isProcessBCenabled || isBarrelEnabled || isMuonEnabled)) {
251251
LOG(fatal) << "No process function was enabled for TableMakerMC. Check it out!!!";
@@ -944,12 +944,12 @@ struct TableMakerMC {
944944
}
945945
auto mfttrack = muon.template matchMFTTrack_as<TMFTTracks>();
946946
VarManager::FillTrackCollision<TMuonFillMap>(muontrack, collision);
947-
if constexpr (static_cast<bool>(TMFTFillMap & VarManager::ObjTypes::MFTCov)) {
948-
auto const& mfttrackcov = mfCovs.rawIteratorAt(map_mfttrackcovs[mfttrack.globalIndex()]);
947+
if constexpr (static_cast<bool>(TMFTFillMap & VarManager::ObjTypes::MFTCov)) {
948+
auto const& mfttrackcov = mfCovs.rawIteratorAt(map_mfttrackcovs[mfttrack.globalIndex()]);
949949
VarManager::FillGlobalMuonRefitCov<TMuonFillMap, TMFTFillMap>(muontrack, mfttrack, collision, mfttrackcov);
950-
}else{
950+
} else {
951951
VarManager::FillGlobalMuonRefit<TMuonFillMap, TMFTFillMap>(muontrack, mfttrack, collision);
952-
}
952+
}
953953
} else {
954954
VarManager::FillTrackCollision<TMuonFillMap>(muon, collision);
955955
}
@@ -1072,12 +1072,12 @@ struct TableMakerMC {
10721072
auto mfttrack = muon.template matchMFTTrack_as<TMFTTracks>();
10731073
globalClusters += mfttrack.nClusters();
10741074
VarManager::FillTrackCollision<TMuonFillMap>(muontrack, collision);
1075-
if constexpr (static_cast<bool>(TMFTFillMap & VarManager::ObjTypes::MFTCov)) {
1076-
auto const& mfttrackcov = mfCovs.rawIteratorAt(map_mfttrackcovs[mfttrack.globalIndex()]);
1075+
if constexpr (static_cast<bool>(TMFTFillMap & VarManager::ObjTypes::MFTCov)) {
1076+
auto const& mfttrackcov = mfCovs.rawIteratorAt(map_mfttrackcovs[mfttrack.globalIndex()]);
10771077
VarManager::FillGlobalMuonRefitCov<TMuonFillMap, TMFTFillMap>(muontrack, mfttrack, collision, mfttrackcov);
1078-
}else{
1078+
} else {
10791079
VarManager::FillGlobalMuonRefit<TMuonFillMap, TMFTFillMap>(muontrack, mfttrack, collision);
1080-
}
1080+
}
10811081
} else {
10821082
VarManager::FillTrackCollision<TMuonFillMap>(muon, collision);
10831083
}
@@ -1189,7 +1189,7 @@ struct TableMakerMC {
11891189
}
11901190

11911191
if constexpr (static_cast<bool>(TMFTFillMap & VarManager::ObjTypes::MFTCov)) {
1192-
for (auto &mfttrackConv : mftCovs) {
1192+
for (auto& mfttrackConv : mftCovs) {
11931193
map_mfttrackcovs[mfttrackConv.matchMFTTrackId()] = mfttrackConv.globalIndex();
11941194
}
11951195
}
@@ -1213,11 +1213,11 @@ struct TableMakerMC {
12131213
if (fConfigVariousOptions.fKeepBestMatch) {
12141214
skimBestMuonMatches(muons);
12151215
}
1216-
if constexpr (static_cast<bool>(TMFTFillMap & VarManager::ObjTypes::MFTCov)) {
1216+
if constexpr (static_cast<bool>(TMFTFillMap & VarManager::ObjTypes::MFTCov)) {
12171217
skimMuons<TMuonFillMap, TMFTFillMap>(collision, muons, groupedMuonIndices, mcParticles, mftTracks, mftCovs);
1218-
}else{
1218+
} else {
12191219
skimMuons<TMuonFillMap, TMFTFillMap>(collision, muons, groupedMuonIndices, mcParticles, mftTracks, nullptr);
1220-
}
1220+
}
12211221
} else {
12221222
auto groupedMuonIndices = fwdTrackAssocs.sliceBy(fwdtrackIndicesPerCollision, origIdx);
12231223
skimMuons<TMuonFillMap, 0u>(collision, muons, groupedMuonIndices, mcParticles, nullptr, nullptr);
@@ -1396,9 +1396,9 @@ struct TableMakerMC {
13961396
}
13971397

13981398
void processPPMuonRefit(MyEventsWithMults const& collisions, aod::BCsWithTimestamps const& bcs,
1399-
MyMuonsWithCov const& tracksMuon, MFTTrackLabeled const& mftTracks,
1400-
aod::FwdTrackAssoc const& fwdTrackAssocs, aod::MFTTrackAssoc const& mftAssocs,
1401-
aod::McCollisions const& mcCollisions, aod::McParticles const& mcParticles, aod::MFTTracksCov const& mftCovs)
1399+
MyMuonsWithCov const& tracksMuon, MFTTrackLabeled const& mftTracks,
1400+
aod::FwdTrackAssoc const& fwdTrackAssocs, aod::MFTTrackAssoc const& mftAssocs,
1401+
aod::McCollisions const& mcCollisions, aod::McParticles const& mcParticles, aod::MFTTracksCov const& mftCovs)
14021402
{
14031403
fullSkimming<gkEventFillMapWithMults, 0u, gkMuonFillMapWithCov, gkMFTCovFillMap>(collisions, bcs, nullptr, tracksMuon, mftTracks, nullptr, fwdTrackAssocs, mftAssocs, mcCollisions, mcParticles, mftCovs);
14041404
}

‎PWGDQ/TableProducer/tableMaker_withAssoc.cxx‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ struct TableMaker {
288288
std::map<uint32_t, uint32_t> fMftIndexMap; // key: MFT tracklet global index, value: new MFT tracklet global index
289289

290290
std::map<uint32_t, bool> fBestMatch;
291-
std::unordered_map<int64_t,int32_t> map_mfttrackcovs;
291+
std::unordered_map<int64_t, int32_t> map_mfttrackcovs;
292292
// FIXME: For now, the skimming is done using the Common track-collision association task, which does not allow to use
293293
// our own Filtered tracks. If the filter is very selective, then it may be worth to run the association in this workflow
294294
// using the Common/CollisionAssociation class
@@ -1209,12 +1209,12 @@ struct TableMaker {
12091209
VarManager::FillTrackCollision<TMuonFillMap>(muontrack, collision);
12101210
// NOTE: the MFT track originally associated to the MUON track is currently used in the global muon refit
12111211
// Should MUON - MFT time ambiguities be taken into account ?
1212-
if constexpr (static_cast<bool>(TMFTFillMap & VarManager::ObjTypes::MFTCov)) {
1213-
auto const& mfttrackcov = mfCovs.rawIteratorAt(map_mfttrackcovs[mfttrack.globalIndex()]);
1212+
if constexpr (static_cast<bool>(TMFTFillMap & VarManager::ObjTypes::MFTCov)) {
1213+
auto const& mfttrackcov = mfCovs.rawIteratorAt(map_mfttrackcovs[mfttrack.globalIndex()]);
12141214
VarManager::FillGlobalMuonRefitCov<TMuonFillMap, TMFTFillMap>(muontrack, mfttrack, collision, mfttrackcov);
1215-
}else{
1215+
} else {
12161216
VarManager::FillGlobalMuonRefit<TMuonFillMap, TMFTFillMap>(muontrack, mfttrack, collision);
1217-
}
1217+
}
12181218
} else {
12191219
VarManager::FillTrackCollision<TMuonFillMap>(muon, collision);
12201220
}
@@ -1301,12 +1301,12 @@ struct TableMaker {
13011301
auto mfttrack = muon.template matchMFTTrack_as<MFTTracks>();
13021302
globalClusters += mfttrack.nClusters();
13031303
VarManager::FillTrackCollision<TMuonFillMap>(muontrack, collision);
1304-
if constexpr (static_cast<bool>(TMFTFillMap & VarManager::ObjTypes::MFTCov)) {
1305-
auto const& mfttrackcov = mfCovs.rawIteratorAt(map_mfttrackcovs[mfttrack.globalIndex()]);
1304+
if constexpr (static_cast<bool>(TMFTFillMap & VarManager::ObjTypes::MFTCov)) {
1305+
auto const& mfttrackcov = mfCovs.rawIteratorAt(map_mfttrackcovs[mfttrack.globalIndex()]);
13061306
VarManager::FillGlobalMuonRefitCov<TMuonFillMap, TMFTFillMap>(muontrack, mfttrack, collision, mfttrackcov);
1307-
}else{
1307+
} else {
13081308
VarManager::FillGlobalMuonRefit<TMuonFillMap, TMFTFillMap>(muontrack, mfttrack, collision);
1309-
}
1309+
}
13101310
} else {
13111311
VarManager::FillTrackCollision<TMuonFillMap>(muon, collision);
13121312
}
@@ -1422,7 +1422,7 @@ struct TableMaker {
14221422
}
14231423

14241424
if constexpr (static_cast<bool>(TMFTFillMap & VarManager::ObjTypes::MFTCov)) {
1425-
for (auto &mfttrackConv : mftCovs) {
1425+
for (auto& mfttrackConv : mftCovs) {
14261426
map_mfttrackcovs[mfttrackConv.matchMFTTrackId()] = mfttrackConv.globalIndex();
14271427
}
14281428
}
@@ -1444,14 +1444,14 @@ struct TableMaker {
14441444
if constexpr (static_cast<bool>(TMuonFillMap)) {
14451445
if constexpr (static_cast<bool>(TMFTFillMap)) {
14461446
auto groupedMuonIndices = fwdTrackAssocs.sliceBy(fwdtrackIndicesPerCollision, origIdx);
1447-
if (fConfigVariousOptions.fKeepBestMatch) {
1448-
skimBestMuonMatches(muons);
1449-
}
1450-
if constexpr (static_cast<bool>(TMFTFillMap & VarManager::ObjTypes::MFTCov)) {
1451-
skimMuons<TMuonFillMap, TMFTFillMap>(collision, bcs, muons, groupedMuonIndices, mftTracks, mftCovs);
1452-
}else{
1453-
skimMuons<TMuonFillMap, TMFTFillMap>(collision, bcs, muons, groupedMuonIndices, mftTracks, nullptr);
1454-
}
1447+
if (fConfigVariousOptions.fKeepBestMatch) {
1448+
skimBestMuonMatches(muons);
1449+
}
1450+
if constexpr (static_cast<bool>(TMFTFillMap & VarManager::ObjTypes::MFTCov)) {
1451+
skimMuons<TMuonFillMap, TMFTFillMap>(collision, bcs, muons, groupedMuonIndices, mftTracks, mftCovs);
1452+
} else {
1453+
skimMuons<TMuonFillMap, TMFTFillMap>(collision, bcs, muons, groupedMuonIndices, mftTracks, nullptr);
1454+
}
14551455
} else {
14561456
auto groupedMuonIndices = fwdTrackAssocs.sliceBy(fwdtrackIndicesPerCollision, origIdx);
14571457
skimMuons<TMuonFillMap, 0u>(collision, bcs, muons, groupedMuonIndices, nullptr, nullptr);

0 commit comments

Comments
 (0)