Skip to content

Muon chambers bitmap #6440

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
nicolovalle wants to merge 5 commits into from
Closed

Muon chambers bitmap #6440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
af378fa
Muon chambers bitmap
nicolovalle Jun 16, 2021
bea9b98
Please consider the following formatting changes
alibuild Jun 16, 2021
6045802
Merge pull request #1 from alibuild/alibot-cleanup-6440
nicolovalle Jun 16, 2021
5541905
Update AnalysisDataModel.h
nicolovalle Jun 16, 2021
5d3c3da
Update AnalysisDataModel.h
nicolovalle Jun 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Analysis/DataModel/include/AnalysisDataModel/ReducedInfoTables.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions Analysis/Tasks/PWGDQ/tableMaker.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down
2 changes: 1 addition & 1 deletion Analysis/Tasks/PWGDQ/tableMaker_PbPb.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down
4 changes: 3 additions & 1 deletion Framework/Core/include/Framework/AnalysisDataModel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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; });
Expand Down Expand Up @@ -440,7 +441,8 @@ DECLARE_SOA_TABLE_FULL(StoredFwdTracks, "FwdTracks", "AOD", "FWDTRACK",
fwdtrack::Pz<fwdtrack::Pt, fwdtrack::Tgl>,
fwdtrack::Sign<fwdtrack::Signed1Pt>,
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
Expand Down