Skip to content
Merged
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
2 changes: 1 addition & 1 deletion Common/TableProducer/fwdtrackextension.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ struct FwdTrackExtension {
float dcaX = -999;
float dcaY = -999;
if (track.has_collision()) {
if (track.trackType() == o2::aod::fwdtrack::ForwardTrackTypeEnum::GlobalMuonTrack || track.trackType() == o2::aod::fwdtrack::ForwardTrackTypeEnum::GlobalForwardTrack) {
if (track.trackType() == o2::aod::fwdtrack::ForwardTrackTypeEnum::GlobalMuonTrack || track.trackType() == o2::aod::fwdtrack::ForwardTrackTypeEnum::GlobalForwardTrack || track.trackType() == o2::aod::fwdtrack::ForwardTrackTypeEnum::MuonStandaloneTrack) {

auto const& collision = track.collision();
double chi2 = track.chi2();
Expand Down
22 changes: 20 additions & 2 deletions PWGDQ/Tasks/tableReader.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -845,7 +845,7 @@ struct AnalysisSameEventPairing {
Form("PairsBarrelSEPM_%s_%s", objArray->At(icut)->GetName(), objArrayPair->At(iPairCut)->GetName()),
Form("PairsBarrelSEPP_%s_%s", objArray->At(icut)->GetName(), objArrayPair->At(iPairCut)->GetName()),
Form("PairsBarrelSEMM_%s_%s", objArray->At(icut)->GetName(), objArrayPair->At(iPairCut)->GetName())};
histNames += Form("%s;%s;%s;", names[0].Data(), names[1].Data(), names[2].Data());
histNames += Form("%s;%s;%s;%s_unambiguous;%s_unambiguous;%s_unambiguous;", names[0].Data(), names[1].Data(), names[2].Data(), names[0].Data(), names[1].Data(), names[2].Data());
fTrackHistNames.push_back(names);
} // end loop (pair cuts)
} // end if (pair cuts)
Expand All @@ -864,7 +864,7 @@ struct AnalysisSameEventPairing {
Form("PairsMuonSEPM_%s", objArray->At(icut)->GetName()),
Form("PairsMuonSEPP_%s", objArray->At(icut)->GetName()),
Form("PairsMuonSEMM_%s", objArray->At(icut)->GetName())};
histNames += Form("%s;%s;%s;", names[0].Data(), names[1].Data(), names[2].Data());
histNames += Form("%s;%s;%s;%s_unambiguous;%s_unambiguous;%s_unambiguous;", names[0].Data(), names[1].Data(), names[2].Data(), names[0].Data(), names[1].Data(), names[2].Data());
fMuonHistNames.push_back(names);

TString cutNamesStr = fConfigPairCuts.value;
Expand Down Expand Up @@ -1066,11 +1066,20 @@ struct AnalysisSameEventPairing {
if (twoTrackFilter & (uint32_t(1) << icut)) {
if (t1.sign() * t2.sign() < 0) {
fHistMan->FillHistClass(histNames[iCut][0].Data(), VarManager::fgValues);
if (!(t1.isAmbiguous() || t2.isAmbiguous())) {
fHistMan->FillHistClass(Form("%s_unambiguous", histNames[iCut][0].Data()), VarManager::fgValues);
}
} else {
if (t1.sign() > 0) {
fHistMan->FillHistClass(histNames[iCut][1].Data(), VarManager::fgValues);
if (!(t1.isAmbiguous() || t2.isAmbiguous())) {
fHistMan->FillHistClass(Form("%s_unambiguous", histNames[iCut][1].Data()), VarManager::fgValues);
}
} else {
fHistMan->FillHistClass(histNames[iCut][2].Data(), VarManager::fgValues);
if (!(t1.isAmbiguous() || t2.isAmbiguous())) {
fHistMan->FillHistClass(Form("%s_unambiguous", histNames[iCut][2].Data()), VarManager::fgValues);
}
}
}
iCut++;
Expand All @@ -1080,11 +1089,20 @@ struct AnalysisSameEventPairing {
continue;
if (t1.sign() * t2.sign() < 0) {
fHistMan->FillHistClass(histNames[iCut][0].Data(), VarManager::fgValues);
if (!(t1.isAmbiguous() || t2.isAmbiguous())) {
fHistMan->FillHistClass(Form("%s_unambiguous", histNames[iCut][0].Data()), VarManager::fgValues);
}
} else {
if (t1.sign() > 0) {
fHistMan->FillHistClass(histNames[iCut][1].Data(), VarManager::fgValues);
if (!(t1.isAmbiguous() || t2.isAmbiguous())) {
fHistMan->FillHistClass(Form("%s_unambiguous", histNames[iCut][1].Data()), VarManager::fgValues);
}
} else {
fHistMan->FillHistClass(histNames[iCut][2].Data(), VarManager::fgValues);
if (!(t1.isAmbiguous() || t2.isAmbiguous())) {
fHistMan->FillHistClass(Form("%s_unambiguous", histNames[iCut][2].Data()), VarManager::fgValues);
}
}
}
} // end loop (pair cuts)
Expand Down