Skip to content

Commit c6da28f

Browse files
committed
Fix indexing issue of BC
1 parent c07f7a2 commit c6da28f

File tree

1 file changed

+5
-51
lines changed

1 file changed

+5
-51
lines changed

EventFiltering/PWGLF/filterf1proton.cxx

Lines changed: 5 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -478,10 +478,11 @@ struct filterf1proton {
478478
// using EventCandidates = soa::Join<aod::Collisions, aod::EvSels, aod::Mults>;
479479
using EventCandidates = aod::Collisions;
480480
using ResoV0s = aod::V0Datas;
481-
using PrimaryTrackCandidates = soa::Filtered<soa::Join<aod::Tracks, aod::TracksCovIU, aod::TracksIU, aod::TracksExtra, aod::TracksDCA, aod::TrackSelection,
481+
using PrimaryTrackCandidates = soa::Filtered<soa::Join<aod::Tracks, aod::TracksExtra, aod::TracksDCA, aod::TrackSelection,
482482
aod::pidTPCFullPi, aod::pidTOFFullPi,
483483
aod::pidTPCFullKa, aod::pidTOFFullKa,
484484
aod::pidTPCFullPr, aod::pidTOFFullPr>>;
485+
using PrimaryTrackCandidatesIU = soa::Filtered<soa::Join<aod::TracksCovIU, aod::TracksIU, aod::TracksExtra, aod::TracksDCA, aod::pidTPCFullPi, aod::pidTOFFullPi, aod::pidTPCFullKa, aod::pidTOFFullKa, aod::pidTPCFullPr, aod::pidTOFFullPr>>;
485486

486487
void processF1Proton(EventCandidates::iterator const& collision, aod::BCsWithTimestamps const&, PrimaryTrackCandidates const& tracks, ResoV0s const& V0s)
487488
{
@@ -700,31 +701,12 @@ struct filterf1proton {
700701
}
701702
PROCESS_SWITCH(filterf1proton, processF1Proton, "Process for trigger", false);
702703
TLorentzVector v0Dummy;
703-
void processF1ProtonHelper(EventCandidates::iterator const& collision, aod::BCsWithTimestamps const&, PrimaryTrackCandidates const& tracks, aod::V0s const& V0s)
704+
void processF1ProtonHelper(EventCandidates::iterator const& collision, aod::BCs const&, PrimaryTrackCandidates const& tracks, PrimaryTrackCandidatesIU const& tracksIU, aod::V0s const& V0s)
704705
{
705706
initCCDB(collision.bc().runNumber());
706707
bool keepEventF1Proton = false;
707708
int numberF1 = 0;
708709
if (isSelectedEvent(collision)) {
709-
if (ConfUseManualPIDproton || ConfUseManualPIDkaon || ConfUseManualPIDpion) {
710-
currentRunNumber = collision.bc_as<aod::BCsWithTimestamps>().runNumber();
711-
if (currentRunNumber != lastRunNumber) {
712-
auto bc = collision.bc_as<aod::BCsWithTimestamps>();
713-
if (ConfUseManualPIDproton) {
714-
BBProton = setValuesBB(ccdbApi, bc, ConfPIDBBProton);
715-
BBAntiproton = setValuesBB(ccdbApi, bc, ConfPIDBBAntiProton);
716-
}
717-
if (ConfUseManualPIDpion) {
718-
BBPion = setValuesBB(ccdbApi, bc, ConfPIDBBPion);
719-
BBAntipion = setValuesBB(ccdbApi, bc, ConfPIDBBAntiPion);
720-
}
721-
if (ConfUseManualPIDkaon) {
722-
BBKaon = setValuesBB(ccdbApi, bc, ConfPIDBBKaon);
723-
BBAntikaon = setValuesBB(ccdbApi, bc, ConfPIDBBAntiKaon);
724-
}
725-
lastRunNumber = currentRunNumber;
726-
}
727-
}
728710

729711
// keep track of indices
730712
std::vector<int> PionIndex = {};
@@ -750,27 +732,6 @@ struct filterf1proton {
750732
qaRegistry.fill(HIST("hPhi"), track.phi());
751733
double nTPCSigmaP[3]{track.tpcNSigmaPi(), track.tpcNSigmaKa(), track.tpcNSigmaPr()};
752734
double nTPCSigmaN[3]{track.tpcNSigmaPi(), track.tpcNSigmaKa(), track.tpcNSigmaPr()};
753-
if (ConfUseManualPIDproton) {
754-
auto bgScalingProton = 1 / massPr; // momentum scaling?
755-
if (BBProton.size() == 6)
756-
nTPCSigmaP[2] = updatePID(track, bgScalingProton, BBProton);
757-
if (BBAntiproton.size() == 6)
758-
nTPCSigmaN[2] = updatePID(track, bgScalingProton, BBAntiproton);
759-
}
760-
if (ConfUseManualPIDkaon) {
761-
auto bgScalingKaon = 1 / massKa; // momentum scaling?
762-
if (BBKaon.size() == 6)
763-
nTPCSigmaP[1] = updatePID(track, bgScalingKaon, BBKaon);
764-
if (BBAntikaon.size() == 6)
765-
nTPCSigmaN[1] = updatePID(track, bgScalingKaon, BBAntikaon);
766-
}
767-
if (ConfUseManualPIDpion) {
768-
auto bgScalingPion = 1 / massPi; // momentum scaling?
769-
if (BBPion.size() == 6)
770-
nTPCSigmaP[0] = updatePID(track, bgScalingPion, BBPion);
771-
if (BBAntipion.size() == 6)
772-
nTPCSigmaN[0] = updatePID(track, bgScalingPion, BBAntipion);
773-
}
774735

775736
if ((track.sign() > 0 && SelectionPID(track, strategyPIDPion, 0, nTPCSigmaP[0])) || (track.sign() < 0 && SelectionPID(track, strategyPIDPion, 0, nTPCSigmaN[0]))) {
776737
ROOT::Math::PtEtaPhiMVector temp(track.pt(), track.eta(), track.phi(), massPi);
@@ -830,8 +791,8 @@ struct filterf1proton {
830791

831792
for (auto& v0 : V0s) {
832793

833-
auto postrack = v0.template posTrack_as<PrimaryTrackCandidates>();
834-
auto negtrack = v0.template negTrack_as<PrimaryTrackCandidates>();
794+
auto postrack = v0.template posTrack_as<PrimaryTrackCandidatesIU>();
795+
auto negtrack = v0.template negTrack_as<PrimaryTrackCandidatesIU>();
835796
auto trackparpos = getTrackParCov(postrack);
836797
auto trackparneg = getTrackParCov(negtrack);
837798
if (!mStraHelper.buildV0Candidate(v0.collisionId(), collision.posX(), collision.posY(), collision.posZ(), postrack, negtrack, trackparpos, trackparneg)) {
@@ -865,13 +826,6 @@ struct filterf1proton {
865826
}
866827
double nTPCSigmaPos[1]{postrack.tpcNSigmaPi()};
867828
double nTPCSigmaNeg[1]{negtrack.tpcNSigmaPi()};
868-
if (ConfUseManualPIDdaughterPion) {
869-
auto bgScalingPion = 1 / massPi; // momentum scaling?
870-
if (BBPion.size() == 6)
871-
nTPCSigmaPos[0] = updatePID(postrack, bgScalingPion, BBPion);
872-
if (BBAntipion.size() == 6)
873-
nTPCSigmaNeg[0] = updatePID(negtrack, bgScalingPion, BBAntipion);
874-
}
875829
if (!isSelectedV0Daughter(postrack, 1, nTPCSigmaPos[0])) {
876830
continue;
877831
}

0 commit comments

Comments
 (0)