@@ -374,7 +374,7 @@ struct TreeWriterTpcV0 {
374374 }
375375
376376 // / Evaluate tpcSignal with or without correction
377- template <bool IsCorrecteddEdx, typename TrkType>
377+ template <bool IsCorrecteddEdx, typename TrkType>
378378 double tpcSignalGeneric (const TrkType& track)
379379 {
380380 if constexpr (IsCorrecteddEdx) {
@@ -384,7 +384,7 @@ struct TreeWriterTpcV0 {
384384 }
385385 }
386386
387- template <bool IsCorrecteddEdx, typename TrksType>
387+ template <bool IsCorrecteddEdx, typename TrksType>
388388 void runStandard (Colls::iterator const & collision, soa::Filtered<TrksType> const & tracks, V0sWithID const & v0s, CascsWithID const & cascs)
389389 {
390390 // / Check event slection
@@ -412,17 +412,16 @@ struct TreeWriterTpcV0 {
412412 V0Daughter prPos{downsamplingTsalisProtons, MassProton, maxPt4dwnsmplTsalisProtons, posTrack.tpcNSigmaPr (), posTrack.tofNSigmaPr (), posTrack.tpcExpSignalPr (tpcSignalGeneric<IsCorrecteddEdx>(posTrack)), PidProton, dwnSmplFactor_Pr, true };
413413 V0Daughter prNeg{downsamplingTsalisProtons, MassProton, maxPt4dwnsmplTsalisProtons, negTrack.tpcNSigmaPr (), negTrack.tofNSigmaPr (), negTrack.tpcExpSignalPr (tpcSignalGeneric<IsCorrecteddEdx>(negTrack)), PidProton, dwnSmplFactor_Pr, true };
414414
415- const std::array<V0Mother, 4 > v0Mothers {
415+ const std::array<V0Mother, 4 > v0Mothers{
416416 V0Mother{kGamma , elPos, elNeg},
417417 V0Mother{kK0S , piPos, piNeg},
418418 V0Mother{kLambda , prPos, piNeg},
419- V0Mother{kAntiLambda , piPos, prNeg}
420- };
419+ V0Mother{kAntiLambda , piPos, prNeg}};
421420
422- for (const auto & v0Mother : v0Mothers) {
421+ for (const auto & v0Mother : v0Mothers) {
423422 if (static_cast <bool >(posTrack.pidbit () & (1 << v0Mother.id )) && static_cast <bool >(negTrack.pidbit () & (1 << v0Mother.id ))) {
424423 bool isPosDaughter{true };
425- for (const auto & daughter : {v0Mother.posDaughter , v0Mother.negDaughter }) {
424+ for (const auto & daughter : {v0Mother.posDaughter , v0Mother.negDaughter }) {
426425 const auto & dauTrack = isPosDaughter ? posTrack : negTrack;
427426 if (downsampleTsalisCharged (dauTrack.pt (), daughter.downsamplingTsalis , daughter.mass , daughter.maxPt4dwnsmplTsalis )) {
428427 if (!daughter.isApplyTofNSigmaCut || std::fabs (daughter.tofNSigma ) <= nSigmaTOFdautrack) {
@@ -468,7 +467,7 @@ struct TreeWriterTpcV0 {
468467 Preslice<CascsWithID> perCollisionCascs = aod::cascdata::collisionId;
469468 Preslice<TrksWithDEdxCorrection> perCollisionTracksWithNewDEdx = aod::track::collisionId;
470469
471- template <bool IsCorrecteddEdx, bool IsWithdEdx, typename TrksType, typename BCType>
470+ template <bool IsCorrecteddEdx, bool IsWithdEdx, typename TrksType, typename BCType>
472471 void runWithTrQAGeneric (Colls const & collisions, TrksType const & myTracks, V0sWithID const & myV0s, CascsWithID const & myCascs, aod::TracksQAVersion const & tracksQA, Preslice<TrksType> const & perCollisionTracksType)
473472 {
474473 std::vector<int64_t > labelTrack2TrackQA;
@@ -537,17 +536,16 @@ struct TreeWriterTpcV0 {
537536 V0Daughter prPos{downsamplingTsalisProtons, MassProton, maxPt4dwnsmplTsalisProtons, posTrack.tpcNSigmaPr (), posTrack.tofNSigmaPr (), posTrack.tpcExpSignalPr (tpcSignalGeneric<IsCorrecteddEdx>(posTrack)), PidProton, dwnSmplFactor_Pr, true };
538537 V0Daughter prNeg{downsamplingTsalisProtons, MassProton, maxPt4dwnsmplTsalisProtons, negTrack.tpcNSigmaPr (), negTrack.tofNSigmaPr (), negTrack.tpcExpSignalPr (tpcSignalGeneric<IsCorrecteddEdx>(negTrack)), PidProton, dwnSmplFactor_Pr, true };
539538
540- const std::array<V0Mother, 4 > v0Mothers {
539+ const std::array<V0Mother, 4 > v0Mothers{
541540 V0Mother{kGamma , elPos, elNeg},
542541 V0Mother{kK0S , piPos, piNeg},
543542 V0Mother{kLambda , prPos, piNeg},
544- V0Mother{kAntiLambda , piPos, prNeg}
545- };
543+ V0Mother{kAntiLambda , piPos, prNeg}};
546544
547- for (const auto & v0Mother : v0Mothers) {
545+ for (const auto & v0Mother : v0Mothers) {
548546 if (static_cast <bool >(posTrack.pidbit () & (1 << v0Mother.id )) && static_cast <bool >(negTrack.pidbit () & (1 << v0Mother.id ))) {
549547 bool isPosDaughter{true };
550- for (const auto & daughter : {v0Mother.posDaughter , v0Mother.negDaughter }) {
548+ for (const auto & daughter : {v0Mother.posDaughter , v0Mother.negDaughter }) {
551549 const auto & dauTrack = isPosDaughter ? posTrack : negTrack;
552550 const auto & trackQA = isPosDaughter ? posTrackQA : negTrackQA;
553551 const auto & existTrkQA = isPosDaughter ? existPosTrkQA : existNegTrkQA;
@@ -821,63 +819,63 @@ struct TreeWriterTPCTOF {
821819 usedEdx = track.tpcSignal ();
822820 }
823821 if constexpr (isWithdEdx) {
824- rowTPCTOFTreeWithdEdxTrkQA (usedEdx,
825- 1 . / dEdxExp,
826- track.tpcInnerParam (),
827- track.tgl (),
828- track.signed1Pt (),
829- track.eta (),
830- track.phi (),
831- track.y (),
832- mass,
833- bg,
834- multTPC / 11000 .,
835- std::sqrt (nClNorm / ncl),
836- nclPID,
837- id,
838- nSigmaTPC,
839- nSigmaTOF,
840- nSigmaITS,
841- runnumber,
842- trackocc,
843- ft0occ,
844- hadronicRate,
845- existTrkQA ? trackQA.tpcdEdxNorm () : -999 );
822+ rowTPCTOFTreeWithdEdxTrkQA (usedEdx,
823+ 1 . / dEdxExp,
824+ track.tpcInnerParam (),
825+ track.tgl (),
826+ track.signed1Pt (),
827+ track.eta (),
828+ track.phi (),
829+ track.y (),
830+ mass,
831+ bg,
832+ multTPC / 11000 .,
833+ std::sqrt (nClNorm / ncl),
834+ nclPID,
835+ id,
836+ nSigmaTPC,
837+ nSigmaTOF,
838+ nSigmaITS,
839+ runnumber,
840+ trackocc,
841+ ft0occ,
842+ hadronicRate,
843+ existTrkQA ? trackQA.tpcdEdxNorm () : -999 );
846844 } else {
847845 rowTPCTOFTreeWithTrkQA (usedEdx,
848- 1 . / dEdxExp,
849- track.tpcInnerParam (),
850- track.tgl (),
851- track.signed1Pt (),
852- track.eta (),
853- track.phi (),
854- track.y (),
855- mass,
856- bg,
857- multTPC / 11000 .,
858- std::sqrt (nClNorm / ncl),
859- nclPID,
860- id,
861- nSigmaTPC,
862- nSigmaTOF,
863- nSigmaITS,
864- runnumber,
865- trackocc,
866- ft0occ,
867- hadronicRate,
868- bcGlobalIndex,
869- bcTimeFrameId,
870- bcBcInTimeFrame,
871- existTrkQA ? trackQA.tpcClusterByteMask () : -999 ,
872- existTrkQA ? trackQA.tpcdEdxMax0R () : -999 ,
873- existTrkQA ? trackQA.tpcdEdxMax1R () : -999 ,
874- existTrkQA ? trackQA.tpcdEdxMax2R () : -999 ,
875- existTrkQA ? trackQA.tpcdEdxMax3R () : -999 ,
876- existTrkQA ? trackQA.tpcdEdxTot0R () : -999 ,
877- existTrkQA ? trackQA.tpcdEdxTot1R () : -999 ,
878- existTrkQA ? trackQA.tpcdEdxTot2R () : -999 ,
879- existTrkQA ? trackQA.tpcdEdxTot3R () : -999 ,
880- existTrkQA ? trackQA.tpcdEdxNorm () : -999 );
846+ 1 . / dEdxExp,
847+ track.tpcInnerParam (),
848+ track.tgl (),
849+ track.signed1Pt (),
850+ track.eta (),
851+ track.phi (),
852+ track.y (),
853+ mass,
854+ bg,
855+ multTPC / 11000 .,
856+ std::sqrt (nClNorm / ncl),
857+ nclPID,
858+ id,
859+ nSigmaTPC,
860+ nSigmaTOF,
861+ nSigmaITS,
862+ runnumber,
863+ trackocc,
864+ ft0occ,
865+ hadronicRate,
866+ bcGlobalIndex,
867+ bcTimeFrameId,
868+ bcBcInTimeFrame,
869+ existTrkQA ? trackQA.tpcClusterByteMask () : -999 ,
870+ existTrkQA ? trackQA.tpcdEdxMax0R () : -999 ,
871+ existTrkQA ? trackQA.tpcdEdxMax1R () : -999 ,
872+ existTrkQA ? trackQA.tpcdEdxMax2R () : -999 ,
873+ existTrkQA ? trackQA.tpcdEdxMax3R () : -999 ,
874+ existTrkQA ? trackQA.tpcdEdxTot0R () : -999 ,
875+ existTrkQA ? trackQA.tpcdEdxTot1R () : -999 ,
876+ existTrkQA ? trackQA.tpcdEdxTot2R () : -999 ,
877+ existTrkQA ? trackQA.tpcdEdxTot3R () : -999 ,
878+ existTrkQA ? trackQA.tpcdEdxNorm () : -999 );
881879 }
882880 }
883881 }
@@ -906,7 +904,7 @@ struct TreeWriterTPCTOF {
906904 }
907905
908906 // / Evaluate tpcSignal with or without correction
909- template <bool IsCorrecteddEdx, typename TrkType>
907+ template <bool IsCorrecteddEdx, typename TrkType>
910908 double tpcSignalGeneric (const TrkType& track)
911909 {
912910 if constexpr (IsCorrecteddEdx) {
@@ -916,7 +914,7 @@ struct TreeWriterTPCTOF {
916914 }
917915 }
918916
919- template <bool IsCorrecteddEdx, typename TrksType>
917+ template <bool IsCorrecteddEdx, typename TrksType>
920918 void runStandard (Colls::iterator const & collision, soa::Filtered<TrksType> const & tracks)
921919 {
922920 // / Check event selection
@@ -940,12 +938,11 @@ struct TreeWriterTPCTOF {
940938
941939 TofTrack tofPion (false , -999 ., maxMomTPCOnlyPi, trk.tpcNSigmaPi (), nSigmaTPCOnlyPi, downsamplingTsalisPions, MassPion, trk.tofNSigmaPi (), -999 ., trk.tpcExpSignalPi (tpcSignalGeneric<IsCorrecteddEdx>(trk)), PidPion, dwnSmplFactor_Pi, nSigmaTOF_TPCTOF_Pi, nSigmaTPC_TPCTOF_Pi);
942940
943- for (const auto & tofTrack : {tofTriton, tofDeuteron, tofProton, tofKaon, tofPion}) {
941+ for (const auto & tofTrack : {tofTriton, tofDeuteron, tofProton, tofKaon, tofPion}) {
944942 if ((!tofTrack.isApplyHardCutOnly || trk.tpcInnerParam () < tofTrack.maxMomHardCutOnly ) &&
945943 ((trk.tpcInnerParam () <= tofTrack.maxMomTPCOnly && std::fabs (tofTrack.tpcNSigma ) < tofTrack.nSigmaTPCOnly ) ||
946944 (trk.tpcInnerParam () > tofTrack.maxMomTPCOnly && std::fabs (tofTrack.tofNSigma ) < tofTrack.nSigmaTOF_TPCTOF && std::fabs (tofTrack.tpcNSigma ) < tofTrack.nSigmaTPC_TPCTOF )) &&
947- downsampleTsalisCharged (trk.pt (), tofTrack.downsamplingTsalis , tofTrack.mass )
948- ) {
945+ downsampleTsalisCharged (trk.pt (), tofTrack.downsamplingTsalis , tofTrack.mass )) {
949946 fillSkimmedTPCTOFTable<IsCorrecteddEdx>(trk, collision, tofTrack.tpcNSigma , tofTrack.tofNSigma , tofTrack.tpcExpSignal , tofTrack.pid , runnumber, tofTrack.dwnSmplFactor , hadronicRate);
950947 }
951948 }
@@ -967,7 +964,7 @@ struct TreeWriterTPCTOF {
967964 Preslice<Trks> perCollisionTracks = aod::track::collisionId;
968965 Preslice<TrksWithDEdxCorrection> perCollisionTracksWithCorrecteddEdx = aod::track::collisionId;
969966
970- template <bool IsCorrecteddEdx, bool IsWithdEdx, typename TrksType, typename BCType>
967+ template <bool IsCorrecteddEdx, bool IsWithdEdx, typename TrksType, typename BCType>
971968 void runWithTrQAGeneric (Colls const & collisions, TrksType const & myTracks, aod::TracksQAVersion const & tracksQA, Preslice<TrksType> const & perCollisionTracksType)
972969 {
973970 std::vector<int64_t > labelTrack2TrackQA;
@@ -985,9 +982,9 @@ struct TreeWriterTPCTOF {
985982 continue ;
986983 }
987984 const auto & tracksWithITSPid = soa::Attach<TrksType,
988- aod::pidits::ITSNSigmaEl, aod::pidits::ITSNSigmaMu, aod::pidits::ITSNSigmaPi,
989- aod::pidits::ITSNSigmaKa, aod::pidits::ITSNSigmaPr, aod::pidits::ITSNSigmaDe,
990- aod::pidits::ITSNSigmaTr, aod::pidits::ITSNSigmaHe, aod::pidits::ITSNSigmaAl>(tracks);
985+ aod::pidits::ITSNSigmaEl, aod::pidits::ITSNSigmaMu, aod::pidits::ITSNSigmaPi,
986+ aod::pidits::ITSNSigmaKa, aod::pidits::ITSNSigmaPr, aod::pidits::ITSNSigmaDe,
987+ aod::pidits::ITSNSigmaTr, aod::pidits::ITSNSigmaHe, aod::pidits::ITSNSigmaAl>(tracks);
991988
992989 const auto & bc = collision.bc_as <BCType>();
993990 const int runnumber = bc.runNumber ();
@@ -1033,12 +1030,11 @@ struct TreeWriterTPCTOF {
10331030
10341031 TofTrack tofPion (false , -999 ., maxMomTPCOnlyPi, trk.tpcNSigmaPi (), nSigmaTPCOnlyPi, downsamplingTsalisPions, MassPion, trk.tofNSigmaPi (), trk.itsNSigmaPi (), trk.tpcExpSignalPi (tpcSignalGeneric<IsCorrecteddEdx>(trk)), PidPion, dwnSmplFactor_Pi, nSigmaTOF_TPCTOF_Pi, nSigmaTPC_TPCTOF_Pi);
10351032
1036- for (const auto & tofTrack : {tofTriton, tofDeuteron, tofProton, tofKaon, tofPion}) {
1033+ for (const auto & tofTrack : {tofTriton, tofDeuteron, tofProton, tofKaon, tofPion}) {
10371034 if ((!tofTrack.isApplyHardCutOnly || trk.tpcInnerParam () < tofTrack.maxMomHardCutOnly ) &&
10381035 ((trk.tpcInnerParam () <= tofTrack.maxMomTPCOnly && std::fabs (tofTrack.tpcNSigma ) < tofTrack.nSigmaTPCOnly ) ||
1039- (trk.tpcInnerParam () > tofTrack.maxMomTPCOnly && std::fabs (tofTrack.tofNSigma ) < tofTrack.nSigmaTOF_TPCTOF && std::fabs (tofTrack.tpcNSigma ) < tofTrack.nSigmaTPC_TPCTOF )) &&
1040- downsampleTsalisCharged (trk.pt (), tofTrack.downsamplingTsalis , tofTrack.mass )
1041- ) {
1036+ (trk.tpcInnerParam () > tofTrack.maxMomTPCOnly && std::fabs (tofTrack.tofNSigma ) < tofTrack.nSigmaTOF_TPCTOF && std::fabs (tofTrack.tpcNSigma ) < tofTrack.nSigmaTPC_TPCTOF )) &&
1037+ downsampleTsalisCharged (trk.pt (), tofTrack.downsamplingTsalis , tofTrack.mass )) {
10421038 fillSkimmedTPCTOFTableWithTrkQAGeneric<IsCorrecteddEdx, IsWithdEdx>(trk, trackQA, existTrkQA, collision, tofTrack.tpcNSigma , tofTrack.tofNSigma , tofTrack.itsNSigma , tofTrack.tpcExpSignal , tofTrack.pid , runnumber, tofTrack.dwnSmplFactor , hadronicRate, bcGlobalIndex, bcTimeFrameId, bcBcInTimeFrame);
10431039 }
10441040 }
0 commit comments