Skip to content

Commit d1141af

Browse files
mcoquet642Maurice Coquetalibuild
authored
[PWGDQ] event mixing for muons only and ambiguity fix (AliceO2Group#10152)
Co-authored-by: Maurice Coquet <[email protected]> Co-authored-by: ALICE Action Bot <[email protected]>
1 parent 7edc98c commit d1141af

File tree

2 files changed

+41
-5
lines changed

2 files changed

+41
-5
lines changed

PWGDQ/Tasks/dqEfficiency_withAssoc.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1817,7 +1817,7 @@ struct AnalysisSameEventPairing {
18171817
t2.reducedMCTrack().pt(), t2.reducedMCTrack().eta(), t2.reducedMCTrack().phi(), t2.reducedMCTrack().e(),
18181818
t1.reducedMCTrack().vx(), t1.reducedMCTrack().vy(), t1.reducedMCTrack().vz(), t1.reducedMCTrack().vt(),
18191819
t2.reducedMCTrack().vx(), t2.reducedMCTrack().vy(), t2.reducedMCTrack().vz(), t2.reducedMCTrack().vt(),
1820-
(twoTrackFilter & (static_cast<uint32_t>(1) << 28)) || (twoTrackFilter & (static_cast<uint32_t>(1) << 30)), (twoTrackFilter & (static_cast<uint32_t>(1) << 29)) || (twoTrackFilter & (static_cast<uint32_t>(1) << 31)),
1820+
(twoTrackFilter & (static_cast<uint32_t>(1) << 28)) || (twoTrackFilter & (static_cast<uint32_t>(1) << 29)), (twoTrackFilter & (static_cast<uint32_t>(1) << 30)) || (twoTrackFilter & (static_cast<uint32_t>(1) << 31)),
18211821
-999.0, -999.0, -999.0, -999.0, -999.0,
18221822
-999.0, -999.0, -999.0, -999.0, -999.0,
18231823
-999.0, VarManager::fgValues[VarManager::kMultDimuons],

PWGDQ/Tasks/tableReader_withAssoc.cxx

Lines changed: 40 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1155,7 +1155,7 @@ struct AnalysisSameEventPairing {
11551155
Service<o2::ccdb::BasicCCDBManager> fCCDB;
11561156
o2::ccdb::CcdbApi fCCDBApi;
11571157

1158-
Filter filterEventSelected = aod::dqanalysisflags::isEventSelected > static_cast<uint8_t>(1);
1158+
Filter filterEventSelected = aod::dqanalysisflags::isEventSelected > static_cast<uint8_t>(0);
11591159

11601160
HistogramManager* fHistMan;
11611161

@@ -1190,8 +1190,8 @@ struct AnalysisSameEventPairing {
11901190

11911191
fEnableBarrelHistos = context.mOptions.get<bool>("processAllSkimmed") || context.mOptions.get<bool>("processBarrelOnlySkimmed") || context.mOptions.get<bool>("processBarrelOnlyWithCollSkimmed") || context.mOptions.get<bool>("processBarrelOnlySkimmedNoCov");
11921192
fEnableBarrelMixingHistos = context.mOptions.get<bool>("processMixingAllSkimmed") || context.mOptions.get<bool>("processMixingBarrelSkimmed");
1193-
fEnableMuonHistos = context.mOptions.get<bool>("processAllSkimmed") || context.mOptions.get<bool>("processMuonOnlySkimmed") || context.mOptions.get<bool>("processMuonOnlySkimmedMultExtra");
1194-
fEnableMuonMixingHistos = context.mOptions.get<bool>("processMixingAllSkimmed");
1193+
fEnableMuonHistos = context.mOptions.get<bool>("processAllSkimmed") || context.mOptions.get<bool>("processMuonOnlySkimmed") || context.mOptions.get<bool>("processMuonOnlySkimmedMultExtra") || context.mOptions.get<bool>("processMixingMuonSkimmed");
1194+
fEnableMuonMixingHistos = context.mOptions.get<bool>("processMixingAllSkimmed") || context.mOptions.get<bool>("processMixingMuonSkimmed");
11951195

11961196
// Keep track of all the histogram class names to avoid composing strings in the pairing loop
11971197
TString histNames = "";
@@ -1663,7 +1663,7 @@ struct AnalysisSameEventPairing {
16631663
-999., -999., -999., -999.,
16641664
-999., -999., -999., -999.,
16651665
-999., -999., -999., -999.,
1666-
(twoTrackFilter & (static_cast<uint32_t>(1) << 28)) || (twoTrackFilter & (static_cast<uint32_t>(1) << 30)), (twoTrackFilter & (static_cast<uint32_t>(1) << 29)) || (twoTrackFilter & (static_cast<uint32_t>(1) << 31)),
1666+
(twoTrackFilter & (static_cast<uint32_t>(1) << 28)) || (twoTrackFilter & (static_cast<uint32_t>(1) << 29)), (twoTrackFilter & (static_cast<uint32_t>(1) << 30)) || (twoTrackFilter & (static_cast<uint32_t>(1) << 31)),
16671667
VarManager::fgValues[VarManager::kU2Q2], VarManager::fgValues[VarManager::kU3Q3],
16681668
VarManager::fgValues[VarManager::kR2EP_AB], VarManager::fgValues[VarManager::kR2SP_AB], VarManager::fgValues[VarManager::kCentFT0C],
16691669
VarManager::fgValues[VarManager::kCos2DeltaPhi], VarManager::fgValues[VarManager::kCos3DeltaPhi],
@@ -1819,6 +1819,35 @@ struct AnalysisSameEventPairing {
18191819
}
18201820
ncuts = fNCutsMuon;
18211821
histNames = fMuonHistNames;
1822+
1823+
if (fConfigOptions.flatTables.value) {
1824+
dimuonAllList(-999., -999., -999., -999.,
1825+
0, 0,
1826+
-999., -999., -999.,
1827+
VarManager::fgValues[VarManager::kMass],
1828+
false,
1829+
VarManager::fgValues[VarManager::kPt], VarManager::fgValues[VarManager::kEta], VarManager::fgValues[VarManager::kPhi], t1.sign() + t2.sign(), VarManager::fgValues[VarManager::kVertexingChi2PCA],
1830+
VarManager::fgValues[VarManager::kVertexingTauz], VarManager::fgValues[VarManager::kVertexingTauzErr],
1831+
VarManager::fgValues[VarManager::kVertexingTauxy], VarManager::fgValues[VarManager::kVertexingTauxyErr],
1832+
VarManager::fgValues[VarManager::kCosPointingAngle],
1833+
t1.pt(), t1.eta(), t1.phi(), t1.sign(),
1834+
t2.pt(), t2.eta(), t2.phi(), t2.sign(),
1835+
t1.fwdDcaX(), t1.fwdDcaY(), t2.fwdDcaX(), t2.fwdDcaY(),
1836+
0., 0.,
1837+
t1.chi2MatchMCHMID(), t2.chi2MatchMCHMID(),
1838+
t1.chi2MatchMCHMFT(), t2.chi2MatchMCHMFT(),
1839+
t1.chi2(), t2.chi2(),
1840+
-999., -999., -999., -999.,
1841+
-999., -999., -999., -999.,
1842+
-999., -999., -999., -999.,
1843+
-999., -999., -999., -999.,
1844+
(twoTrackFilter & (static_cast<uint32_t>(1) << 28)) || (twoTrackFilter & (static_cast<uint32_t>(1) << 29)), (twoTrackFilter & (static_cast<uint32_t>(1) << 30)) || (twoTrackFilter & (static_cast<uint32_t>(1) << 31)),
1845+
VarManager::fgValues[VarManager::kU2Q2], VarManager::fgValues[VarManager::kU3Q3],
1846+
VarManager::fgValues[VarManager::kR2EP_AB], VarManager::fgValues[VarManager::kR2SP_AB], VarManager::fgValues[VarManager::kCentFT0C],
1847+
VarManager::fgValues[VarManager::kCos2DeltaPhi], VarManager::fgValues[VarManager::kCos3DeltaPhi],
1848+
VarManager::fgValues[VarManager::kCORR2POI], VarManager::fgValues[VarManager::kCORR4POI], VarManager::fgValues[VarManager::kM01POI], VarManager::fgValues[VarManager::kM0111POI], VarManager::fgValues[VarManager::kMultDimuons],
1849+
VarManager::fgValues[VarManager::kVertexingPz], VarManager::fgValues[VarManager::kVertexingSV]);
1850+
}
18221851
}
18231852
/*if constexpr (TPairType == VarManager::kElectronMuon) {
18241853
twoTrackFilter = a1.isBarrelSelected_raw() & a1.isBarrelSelectedPrefilter_raw() & a2.isMuonSelected_raw() & fTrackFilterMask;
@@ -1957,6 +1986,12 @@ struct AnalysisSameEventPairing {
19571986
runSameSideMixing<pairTypeEE, gkEventFillMap>(events, trackAssocs, tracks, trackAssocsPerCollision);
19581987
}
19591988

1989+
void processMixingMuonSkimmed(soa::Filtered<MyEventsHashSelected>& events,
1990+
soa::Join<aod::ReducedMuonsAssoc, aod::MuonTrackCuts> const& muonAssocs, MyMuonTracksWithCovWithAmbiguities const& muons)
1991+
{
1992+
runSameSideMixing<pairTypeMuMu, gkEventFillMap>(events, muonAssocs, muons, muonAssocsPerCollision);
1993+
}
1994+
19601995
void processDummy(MyEvents&)
19611996
{
19621997
// do nothing
@@ -1970,6 +2005,7 @@ struct AnalysisSameEventPairing {
19702005
PROCESS_SWITCH(AnalysisSameEventPairing, processMuonOnlySkimmedMultExtra, "Run muon only pairing, with skimmed tracks", false);
19712006
PROCESS_SWITCH(AnalysisSameEventPairing, processMixingAllSkimmed, "Run all types of mixed pairing, with skimmed tracks/muons", false);
19722007
PROCESS_SWITCH(AnalysisSameEventPairing, processMixingBarrelSkimmed, "Run barrel type mixing pairing, with skimmed tracks", false);
2008+
PROCESS_SWITCH(AnalysisSameEventPairing, processMixingMuonSkimmed, "Run muon type mixing pairing, with skimmed muons", false);
19732009
PROCESS_SWITCH(AnalysisSameEventPairing, processDummy, "Dummy function, enabled only if none of the others are enabled", false);
19742010
};
19752011

0 commit comments

Comments
 (0)