diff --git a/Analysis/DataModel/include/AnalysisDataModel/ReducedInfoTables.h b/Analysis/DataModel/include/AnalysisDataModel/ReducedInfoTables.h index d2eaa17b04c0b..238dadea4688a 100644 --- a/Analysis/DataModel/include/AnalysisDataModel/ReducedInfoTables.h +++ b/Analysis/DataModel/include/AnalysisDataModel/ReducedInfoTables.h @@ -154,7 +154,9 @@ DECLARE_SOA_TABLE(ReducedMuons, "AOD", "RTMUON", //! DECLARE_SOA_TABLE(ReducedMuonsExtra, "AOD", "RTMUONEXTRA", //! fwdtrack::NClusters, fwdtrack::PDca, fwdtrack::RAtAbsorberEnd, fwdtrack::Chi2, fwdtrack::Chi2MatchMCHMID, fwdtrack::Chi2MatchMCHMFT, - fwdtrack::MatchScoreMCHMFT, fwdtrack::MatchMFTTrackID, fwdtrack::MatchMCHTrackID); + fwdtrack::MatchScoreMCHMFT, fwdtrack::MatchMFTTrackID, fwdtrack::MatchMCHTrackID, + fwdtrack::MCHBitMap); + // Muon covariance, TODO: the rest of the matrix should be added when needed DECLARE_SOA_TABLE(ReducedMuonsCov, "AOD", "RTMUONCOV", fwdtrack::X, fwdtrack::Y, fwdtrack::Z, reducedmuon::RawPhi, fwdtrack::Tgl, fwdtrack::Signed1Pt, diff --git a/Analysis/Tasks/PWGDQ/tableMaker.cxx b/Analysis/Tasks/PWGDQ/tableMaker.cxx index 4eedf6e3ad71c..0bd96a47797d3 100644 --- a/Analysis/Tasks/PWGDQ/tableMaker.cxx +++ b/Analysis/Tasks/PWGDQ/tableMaker.cxx @@ -219,8 +219,8 @@ struct TableMaker { muonBasic(event.lastIndex(), trackFilteringTag, muon.pt(), muon.eta(), muon.phi(), muon.sign()); muonExtra(muon.nClusters(), muon.pDca(), muon.rAtAbsorberEnd(), - muon.chi2(), muon.chi2MatchMCHMID(), muon.chi2MatchMCHMFT(), - muon.matchScoreMCHMFT(), muon.matchMFTTrackID(), muon.matchMCHTrackID()); + muon.chi2(), muon.chi2MatchMCHMID(), muon.chi2MatchMCHMFT(), + muon.matchScoreMCHMFT(), muon.matchMFTTrackID(), muon.matchMCHTrackID(), muon.MchBitMap()); muonCov(muon.x(), muon.y(), muon.z(), muon.phi(), muon.tgl(), muon.signed1Pt(), muon.cXX(), muon.cXY(), muon.cYY(), muon.cPhiX(), muon.cPhiY(), muon.cPhiPhi(), muon.cTglX(), muon.cTglY(), muon.cTglPhi(), muon.cTglTgl(), muon.c1PtX(), muon.c1PtY(), diff --git a/Analysis/Tasks/PWGDQ/tableMaker_PbPb.cxx b/Analysis/Tasks/PWGDQ/tableMaker_PbPb.cxx index e6a6ec2b69048..1fe8c8c9e899a 100644 --- a/Analysis/Tasks/PWGDQ/tableMaker_PbPb.cxx +++ b/Analysis/Tasks/PWGDQ/tableMaker_PbPb.cxx @@ -214,7 +214,7 @@ struct TableMaker_PbPb { muonBasic(event.lastIndex(), trackFilteringTag, muon.pt(), muon.eta(), muon.phi(), muon.sign()); muonExtra(muon.nClusters(), muon.pDca(), muon.rAtAbsorberEnd(), muon.chi2(), muon.chi2MatchMCHMID(), muon.chi2MatchMCHMFT(), - muon.matchScoreMCHMFT(), muon.matchMFTTrackID(), muon.matchMCHTrackID()); + muon.matchScoreMCHMFT(), muon.matchMFTTrackID(), muon.matchMCHTrackID(), muon.MchBitMap()); muonCov(muon.x(), muon.y(), muon.z(), muon.phi(), muon.tgl(), muon.signed1Pt(), muon.cXX(), muon.cXY(), muon.cYY(), muon.cPhiX(), muon.cPhiY(), muon.cPhiPhi(), muon.cTglX(), muon.cTglY(), muon.cTglPhi(), muon.cTglTgl(), muon.c1PtX(), muon.c1PtY(), diff --git a/Framework/Core/include/Framework/AnalysisDataModel.h b/Framework/Core/include/Framework/AnalysisDataModel.h index 8d44409cb9fa5..de784ce55dbce 100644 --- a/Framework/Core/include/Framework/AnalysisDataModel.h +++ b/Framework/Core/include/Framework/AnalysisDataModel.h @@ -342,6 +342,7 @@ DECLARE_SOA_COLUMN(Chi2MatchMCHMFT, chi2MatchMCHMFT, float); //! MCH-MFT Match DECLARE_SOA_COLUMN(MatchScoreMCHMFT, matchScoreMCHMFT, float); //! MCH-MFT Machine Learning Matching Score for GlobalMuonTracks DECLARE_SOA_COLUMN(MatchMFTTrackID, matchMFTTrackID, int); //! ID of matching MFT track for GlobalMuonTrack (ints while self indexing not available) DECLARE_SOA_COLUMN(MatchMCHTrackID, matchMCHTrackID, int); //! ID of matching MCH track for GlobalMuonTracks (ints while self indexing not available) +DECLARE_SOA_COLUMN(MCHBitMap, MchBitMap, uint16_t); //! Fired muon chambers BitMap DECLARE_SOA_DYNAMIC_COLUMN(Sign, sign, //! [](float signed1Pt) -> short { return (signed1Pt > 0) ? 1 : -1; }); @@ -440,7 +441,8 @@ DECLARE_SOA_TABLE_FULL(StoredFwdTracks, "FwdTracks", "AOD", "FWDTRACK", fwdtrack::Pz, fwdtrack::Sign, fwdtrack::Chi2, fwdtrack::Chi2MatchMCHMID, fwdtrack::Chi2MatchMCHMFT, - fwdtrack::MatchScoreMCHMFT, fwdtrack::MatchMFTTrackID, fwdtrack::MatchMCHTrackID); + fwdtrack::MatchScoreMCHMFT, fwdtrack::MatchMFTTrackID, fwdtrack::MatchMCHTrackID, + fwdtrack::MCHBitMap); DECLARE_SOA_EXTENDED_TABLE(FwdTracks, StoredFwdTracks, "FWDTRACK", //! aod::fwdtrack::Eta, // NOTE the order is different here than in MFTTracks as table extension has to be unique