2424#include < iterator>
2525#include < string>
2626#include < vector>
27+
2728#include " DataFormatsParameters/GRPMagField.h"
2829#include " DataFormatsParameters/GRPObject.h"
2930#include " ReconstructionDataFormats/Track.h"
@@ -477,10 +478,11 @@ struct filterf1proton {
477478 // using EventCandidates = soa::Join<aod::Collisions, aod::EvSels, aod::Mults>;
478479 using EventCandidates = aod::Collisions;
479480 using ResoV0s = aod::V0Datas;
480- 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,
481482 aod::pidTPCFullPi, aod::pidTOFFullPi,
482483 aod::pidTPCFullKa, aod::pidTOFFullKa,
483484 aod::pidTPCFullPr, aod::pidTOFFullPr>>;
485+ using PrimaryTrackCandidatesIU = soa::Filtered<soa::Join<aod::TracksCovIU, aod::TracksIU, aod::TracksExtra, aod::TracksDCA, aod::TrackSelection, aod::pidTPCFullPi, aod::pidTOFFullPi, aod::pidTPCFullKa, aod::pidTOFFullKa, aod::pidTPCFullPr, aod::pidTOFFullPr>>;
484486
485487 void processF1Proton (EventCandidates::iterator const & collision, aod::BCsWithTimestamps const &, PrimaryTrackCandidates const & tracks, ResoV0s const & V0s)
486488 {
@@ -699,31 +701,12 @@ struct filterf1proton {
699701 }
700702 PROCESS_SWITCH (filterf1proton, processF1Proton, " Process for trigger" , false );
701703 TLorentzVector v0Dummy;
702- 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 &, PrimaryTrackCandidatesIU const & tracks, aod::V0s const & V0s)
703705 {
704706 initCCDB (collision.bc ().runNumber ());
705707 bool keepEventF1Proton = false ;
706708 int numberF1 = 0 ;
707709 if (isSelectedEvent (collision)) {
708- if (ConfUseManualPIDproton || ConfUseManualPIDkaon || ConfUseManualPIDpion) {
709- currentRunNumber = collision.bc_as <aod::BCsWithTimestamps>().runNumber ();
710- if (currentRunNumber != lastRunNumber) {
711- auto bc = collision.bc_as <aod::BCsWithTimestamps>();
712- if (ConfUseManualPIDproton) {
713- BBProton = setValuesBB (ccdbApi, bc, ConfPIDBBProton);
714- BBAntiproton = setValuesBB (ccdbApi, bc, ConfPIDBBAntiProton);
715- }
716- if (ConfUseManualPIDpion) {
717- BBPion = setValuesBB (ccdbApi, bc, ConfPIDBBPion);
718- BBAntipion = setValuesBB (ccdbApi, bc, ConfPIDBBAntiPion);
719- }
720- if (ConfUseManualPIDkaon) {
721- BBKaon = setValuesBB (ccdbApi, bc, ConfPIDBBKaon);
722- BBAntikaon = setValuesBB (ccdbApi, bc, ConfPIDBBAntiKaon);
723- }
724- lastRunNumber = currentRunNumber;
725- }
726- }
727710
728711 // keep track of indices
729712 std::vector<int > PionIndex = {};
@@ -749,27 +732,6 @@ struct filterf1proton {
749732 qaRegistry.fill (HIST (" hPhi" ), track.phi ());
750733 double nTPCSigmaP[3 ]{track.tpcNSigmaPi (), track.tpcNSigmaKa (), track.tpcNSigmaPr ()};
751734 double nTPCSigmaN[3 ]{track.tpcNSigmaPi (), track.tpcNSigmaKa (), track.tpcNSigmaPr ()};
752- if (ConfUseManualPIDproton) {
753- auto bgScalingProton = 1 / massPr; // momentum scaling?
754- if (BBProton.size () == 6 )
755- nTPCSigmaP[2 ] = updatePID (track, bgScalingProton, BBProton);
756- if (BBAntiproton.size () == 6 )
757- nTPCSigmaN[2 ] = updatePID (track, bgScalingProton, BBAntiproton);
758- }
759- if (ConfUseManualPIDkaon) {
760- auto bgScalingKaon = 1 / massKa; // momentum scaling?
761- if (BBKaon.size () == 6 )
762- nTPCSigmaP[1 ] = updatePID (track, bgScalingKaon, BBKaon);
763- if (BBAntikaon.size () == 6 )
764- nTPCSigmaN[1 ] = updatePID (track, bgScalingKaon, BBAntikaon);
765- }
766- if (ConfUseManualPIDpion) {
767- auto bgScalingPion = 1 / massPi; // momentum scaling?
768- if (BBPion.size () == 6 )
769- nTPCSigmaP[0 ] = updatePID (track, bgScalingPion, BBPion);
770- if (BBAntipion.size () == 6 )
771- nTPCSigmaN[0 ] = updatePID (track, bgScalingPion, BBAntipion);
772- }
773735
774736 if ((track.sign () > 0 && SelectionPID (track, strategyPIDPion, 0 , nTPCSigmaP[0 ])) || (track.sign () < 0 && SelectionPID (track, strategyPIDPion, 0 , nTPCSigmaN[0 ]))) {
775737 ROOT::Math::PtEtaPhiMVector temp (track.pt (), track.eta (), track.phi (), massPi);
@@ -829,8 +791,8 @@ struct filterf1proton {
829791
830792 for (auto & v0 : V0s) {
831793
832- auto postrack = v0.template posTrack_as <PrimaryTrackCandidates >();
833- auto negtrack = v0.template negTrack_as <PrimaryTrackCandidates >();
794+ auto postrack = v0.template posTrack_as <PrimaryTrackCandidatesIU >();
795+ auto negtrack = v0.template negTrack_as <PrimaryTrackCandidatesIU >();
834796 auto trackparpos = getTrackParCov (postrack);
835797 auto trackparneg = getTrackParCov (negtrack);
836798 if (!mStraHelper .buildV0Candidate (v0.collisionId (), collision.posX (), collision.posY (), collision.posZ (), postrack, negtrack, trackparpos, trackparneg)) {
@@ -864,13 +826,6 @@ struct filterf1proton {
864826 }
865827 double nTPCSigmaPos[1 ]{postrack.tpcNSigmaPi ()};
866828 double nTPCSigmaNeg[1 ]{negtrack.tpcNSigmaPi ()};
867- if (ConfUseManualPIDdaughterPion) {
868- auto bgScalingPion = 1 / massPi; // momentum scaling?
869- if (BBPion.size () == 6 )
870- nTPCSigmaPos[0 ] = updatePID (postrack, bgScalingPion, BBPion);
871- if (BBAntipion.size () == 6 )
872- nTPCSigmaNeg[0 ] = updatePID (negtrack, bgScalingPion, BBAntipion);
873- }
874829 if (!isSelectedV0Daughter (postrack, 1 , nTPCSigmaPos[0 ])) {
875830 continue ;
876831 }
0 commit comments