Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 7 additions & 2 deletions PWGDQ/Core/VarManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ class VarManager : public TObject
kTripleCandidateToPKPi, // e.g. Lambda_c -> p K- pi+
kJpsiHadronMass, // using the real hadron mass
kJpsiPionMass, // treat the hadron as pion
kDsToKKPi, // e.g. Ds+ -> K+ K- pi+ or cc.
kNMaxCandidateTypes
};

Expand Down Expand Up @@ -5841,7 +5842,7 @@ void VarManager::FillDileptonTrackVertexing(C const& collision, T1 const& lepton

procCode = VarManager::fgFitterThreeProngFwd.process(pars1, pars2, pars3);
procCodeJpsi = VarManager::fgFitterTwoProngFwd.process(pars1, pars2);
} else if constexpr ((candidateType == kBtoJpsiEEK || candidateType == kDstarToD0KPiPi) && TrackHasCov) {
} else if constexpr ((candidateType == kBtoJpsiEEK || candidateType == kDstarToD0KPiPi || candidateType == kDsToKKPi) && TrackHasCov) {
if constexpr (candidateType == kBtoJpsiEEK) {
mlepton1 = o2::constants::physics::MassElectron;
mlepton2 = o2::constants::physics::MassElectron;
Expand All @@ -5850,6 +5851,10 @@ void VarManager::FillDileptonTrackVertexing(C const& collision, T1 const& lepton
mlepton1 = o2::constants::physics::MassKaonCharged;
mlepton2 = o2::constants::physics::MassPionCharged;
mtrack = o2::constants::physics::MassPionCharged;
} else if constexpr (candidateType == kDsToKKPi) {
mlepton1 = o2::constants::physics::MassKaonCharged;
mlepton2 = o2::constants::physics::MassKaonCharged;
mtrack = o2::constants::physics::MassPionCharged;
}
std::array<float, o2::dqconstants::defaults::NumTrkCovParsNoX> lepton1pars = {lepton1.y(), lepton1.z(), lepton1.snp(), lepton1.tgl(), lepton1.signed1Pt()};
std::array<float, o2::dqconstants::defaults::TrkCovEntriesNoX> lepton1covs = {lepton1.cYY(), lepton1.cZY(), lepton1.cZZ(), lepton1.cSnpY(), lepton1.cSnpZ(),
Expand Down Expand Up @@ -5925,7 +5930,7 @@ void VarManager::FillDileptonTrackVertexing(C const& collision, T1 const& lepton
o2::dataformats::VertexBase primaryVertex = {vtxXYZ, vtxCov};
auto covMatrixPV = primaryVertex.getCov();

if constexpr ((candidateType == kBtoJpsiEEK || candidateType == kDstarToD0KPiPi) && TrackHasCov) {
if constexpr ((candidateType == kBtoJpsiEEK || candidateType == kDstarToD0KPiPi || candidateType == kDsToKKPi) && TrackHasCov) {
secondaryVertex = fgFitterThreeProngBarrel.getPCACandidate();
covMatrixPCA = fgFitterThreeProngBarrel.calcPCACovMatrixFlat();
} else if constexpr (candidateType == kBcToThreeMuons && MuonHasCov) {
Expand Down
60 changes: 43 additions & 17 deletions PWGDQ/Tasks/tableReader_withAssoc.h
Original file line number Diff line number Diff line change
Expand Up @@ -4198,6 +4198,7 @@ struct AnalysisDileptonTrack {
o2::framework::Configurable<bool> fConfigUseRapcut{"cfgUseMCRapcut", false, "Use Rap cut for dileptons used in the triplet vertexing"};
o2::framework::Configurable<bool> fConfigEnergycorrelator{"cfgEnergycorrelator", false, "Add some hist for energy correlator study"};
o2::framework::Configurable<bool> fConfigApplyMassEC{"cfgApplyMassEC", false, "Apply fit mass for sideband for the energy correlator study"};
o2::framework::Configurable<bool> fConfigBMesonsTable{"cfgBMesonsTable", false, "Write out B mesons table for ML analysis"};
o2::framework::Configurable<std::vector<float>> fConfigFitmassEC{"cfgTFitmassEC", std::vector<float>{-0.541438, 2.8, 3.2}, "parameter from the fit fuction and fit range"};
o2::framework::Configurable<std::vector<float>> fConfigTransRange{"cfgTransRange", std::vector<float>{0.333333, 0.666667}, "Transverse region for the energy correlstor analysis"};

Expand Down Expand Up @@ -4246,9 +4247,10 @@ struct AnalysisDileptonTrack {

void init(o2::framework::InitContext& context)
{
bool isBarrel = context.mOptions.get<bool>("processBarrelSkimmed");
bool isBarrel = context.mOptions.get<bool>("processBarrelSkimmed") || context.mOptions.get<bool>("processDsToKKPi");
bool isBarrelME = context.mOptions.get<bool>("processBarrelMixedEvent");
bool isBarrelAsymmetric = context.mOptions.get<bool>("processDstarToD0Pi");
bool isDsToKKPi = context.mOptions.get<bool>("processDsToKKPi");
bool isMuon = context.mOptions.get<bool>("processMuonSkimmed");
bool isMuonME = context.mOptions.get<bool>("processMuonMixedEvent");

Expand Down Expand Up @@ -4585,7 +4587,7 @@ struct AnalysisDileptonTrack {
for (auto const& assoc : assocs) {

uint32_t trackSelection = 0;
if constexpr (TCandidateType == VarManager::kBtoJpsiEEK) {
if constexpr (TCandidateType == VarManager::kBtoJpsiEEK || TCandidateType == VarManager::kDsToKKPi) {
// check the cuts fulfilled by this candidate track; if none just continue
trackSelection = (assoc.isBarrelSelected_raw() & fTrackCutBitMap);
if (trackSelection == 0) {
Expand Down Expand Up @@ -4617,23 +4619,27 @@ struct AnalysisDileptonTrack {
Effweight_rec = Effweight_rec * Effdilepton * Effhadron * Masswindow;
}
std::vector<float> fTransRange = fConfigTransRange;
VarManager::FillEnergyCorrelatorTriple<VarManager::kDecayToEE, TEventFillMap, TTrackFillMap>(event, lepton1, lepton2, track, fValuesHadron, fTransRange[0], fTransRange[1], fConfigApplyMassEC, fMassBkg->GetRandom(), 1. / Effweight_rec);
if (fConfigEnergycorrelator) {
VarManager::FillEnergyCorrelatorTriple<VarManager::kDecayToEE, TEventFillMap, TTrackFillMap>(event, lepton1, lepton2, track, fValuesHadron, fTransRange[0], fTransRange[1], fConfigApplyMassEC, fMassBkg->GetRandom(), 1. / Effweight_rec);
}

// table to be written out for ML analysis
BmesonsTable(event.runNumber(), event.globalIndex(), event.timestamp(), fValuesHadron[VarManager::kPairMass], dilepton.mass(), fValuesHadron[VarManager::kDeltaMass], fValuesHadron[VarManager::kPairPt], fValuesHadron[VarManager::kPairEta], fValuesHadron[VarManager::kPairPhi], fValuesHadron[VarManager::kPairRap],
fValuesHadron[VarManager::kVertexingLxy], fValuesHadron[VarManager::kVertexingLxyz], fValuesHadron[VarManager::kVertexingLz],
fValuesHadron[VarManager::kVertexingTauxy], fValuesHadron[VarManager::kVertexingTauz], fValuesHadron[VarManager::kCosPointingAngle],
fValuesHadron[VarManager::kVertexingChi2PCA],
track.globalIndex(), lepton1.globalIndex(), lepton2.globalIndex(),
track.tpcInnerParam(), track.eta(), dilepton.pt(), dilepton.eta(), lepton1.tpcInnerParam(), lepton1.eta(), lepton2.tpcInnerParam(), lepton2.eta(),
track.tpcNSigmaKa(), track.tpcNSigmaPi(), track.tpcNSigmaPr(), track.tofNSigmaKa(),
lepton1.tpcNSigmaEl(), lepton1.tpcNSigmaPi(), lepton1.tpcNSigmaPr(),
lepton2.tpcNSigmaEl(), lepton2.tpcNSigmaPi(), lepton2.tpcNSigmaPr(),
track.itsClusterMap(), lepton1.itsClusterMap(), lepton2.itsClusterMap(),
track.itsChi2NCl(), lepton1.itsChi2NCl(), lepton2.itsChi2NCl(),
track.tpcNClsFound(), lepton1.tpcNClsFound(), lepton2.tpcNClsFound(),
track.tpcChi2NCl(), lepton1.tpcChi2NCl(), lepton2.tpcChi2NCl(),
dilepton.filterMap_raw(), trackSelection);
if (fConfigBMesonsTable) {
BmesonsTable(event.runNumber(), event.globalIndex(), event.timestamp(), fValuesHadron[VarManager::kPairMass], dilepton.mass(), fValuesHadron[VarManager::kDeltaMass], fValuesHadron[VarManager::kPairPt], fValuesHadron[VarManager::kPairEta], fValuesHadron[VarManager::kPairPhi], fValuesHadron[VarManager::kPairRap],
fValuesHadron[VarManager::kVertexingLxy], fValuesHadron[VarManager::kVertexingLxyz], fValuesHadron[VarManager::kVertexingLz],
fValuesHadron[VarManager::kVertexingTauxy], fValuesHadron[VarManager::kVertexingTauz], fValuesHadron[VarManager::kCosPointingAngle],
fValuesHadron[VarManager::kVertexingChi2PCA],
track.globalIndex(), lepton1.globalIndex(), lepton2.globalIndex(),
track.tpcInnerParam(), track.eta(), dilepton.pt(), dilepton.eta(), lepton1.tpcInnerParam(), lepton1.eta(), lepton2.tpcInnerParam(), lepton2.eta(),
track.tpcNSigmaKa(), track.tpcNSigmaPi(), track.tpcNSigmaPr(), track.tofNSigmaKa(),
lepton1.tpcNSigmaEl(), lepton1.tpcNSigmaPi(), lepton1.tpcNSigmaPr(),
lepton2.tpcNSigmaEl(), lepton2.tpcNSigmaPi(), lepton2.tpcNSigmaPr(),
track.itsClusterMap(), lepton1.itsClusterMap(), lepton2.itsClusterMap(),
track.itsChi2NCl(), lepton1.itsChi2NCl(), lepton2.itsChi2NCl(),
track.tpcNClsFound(), lepton1.tpcNClsFound(), lepton2.tpcNClsFound(),
track.tpcChi2NCl(), lepton1.tpcChi2NCl(), lepton2.tpcChi2NCl(),
dilepton.filterMap_raw(), trackSelection);
}
}
if constexpr (TCandidateType == VarManager::kDstarToD0KPiPi) {
trackSelection = (assoc.isBarrelSelected_raw() & fTrackCutBitMap);
Expand Down Expand Up @@ -4754,6 +4760,25 @@ struct AnalysisDileptonTrack {
}
}

void processDsToKKPi(o2::soa::Filtered<MyEventsVtxCovSelected> const& events,
o2::soa::Filtered<o2::soa::Join<o2::aod::ReducedTracksAssoc, o2::aod::BarrelTrackCuts>> const& assocs,
MyBarrelTracksWithCov const& tracks,
o2::soa::Filtered<MyDielectronCandidates> const& dileptons)
{
if (events.size() == 0) {
return;
}
if (fCurrentRun != events.begin().runNumber()) {
initParamsFromCCDB(events.begin().timestamp());
fCurrentRun = events.begin().runNumber();
}
for (auto const& event : events) {
auto groupedBarrelAssocs = assocs.sliceBy(trackAssocsPerCollision, event.globalIndex());
auto groupedDielectrons = dileptons.sliceBy(dielectronsPerCollision, event.globalIndex());
runDileptonHadron<VarManager::kDsToKKPi, gkEventFillMapWithCov, gkTrackFillMapWithCov>(event, groupedBarrelAssocs, tracks, groupedDielectrons);
}
}

o2::framework::Preslice<o2::aod::ReducedMuonsAssoc> muonAssocsPerCollision = o2::aod::reducedtrack_association::reducedeventId;
o2::framework::Preslice<MyDimuonCandidates> dimuonsPerCollision = o2::aod::reducedpair::reducedeventId;

Expand Down Expand Up @@ -4930,6 +4955,7 @@ struct AnalysisDileptonTrack {

PROCESS_SWITCH(AnalysisDileptonTrack, processBarrelSkimmed, "Run barrel dilepton-track pairing, using skimmed data", false);
PROCESS_SWITCH(AnalysisDileptonTrack, processDstarToD0Pi, "Run barrel pairing of D0 daughters with pion candidate, using skimmed data", false);
PROCESS_SWITCH(AnalysisDileptonTrack, processDsToKKPi, "Run barrel pairing of K+K- pairs with pion candidate for Ds reconstruction", false);
PROCESS_SWITCH(AnalysisDileptonTrack, processMuonSkimmed, "Run muon dilepton-track pairing, using skimmed data", false);
PROCESS_SWITCH(AnalysisDileptonTrack, processBarrelMixedEvent, "Run barrel dilepton-hadron mixed event pairing", false);
PROCESS_SWITCH(AnalysisDileptonTrack, processMuonMixedEvent, "Run muon dilepton-hadron mixed event pairing", false);
Expand Down
Loading