Skip to content

Commit b48555d

Browse files
YazhenLinYazhenLin
authored
[PWGLF] [PWGLF]fix some errors in hStrangeCorrelation.cxx and hStrangeCorrelationFilter.cxx (#11155)
1 parent 254173a commit b48555d

File tree

2 files changed

+19
-19
lines changed

2 files changed

+19
-19
lines changed

‎PWGLF/TableProducer/Strangeness/hStrangeCorrelationFilter.cxx‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -616,7 +616,7 @@ struct HStrangeCorrelationFilter {
616616
return;
617617
}
618618
}
619-
if (!doPPAnalysis || !isCollisionSelectedPbPb(collision))
619+
if (!doPPAnalysis && !isCollisionSelectedPbPb(collision))
620620
return;
621621

622622
/// _________________________________________________
@@ -663,47 +663,47 @@ struct HStrangeCorrelationFilter {
663663
}
664664
}
665665
if (std::abs(posdau.tpcNSigmaPr()) < strangedEdxNSigmaLoose && std::abs(negdau.tpcNSigmaPi()) < strangedEdxNSigmaLoose) {
666-
if (doPPAnalysis && (v0.v0cosPA() > lambdaCospa)) {
666+
if (v0.v0cosPA() > lambdaCospa) {
667667
if (doPPAnalysis || (v0.distovertotmom(collision.posX(), collision.posY(), collision.posZ()) * o2::constants::physics::MassK0Short < lifetimecutLambda &&
668668
std::abs(v0.dcapostopv()) > dcapostopvLambda && std::abs(v0.dcanegtopv()) > dcanegtopvLambda)) {
669669
BIT_SET(compatibleLambda, 0);
670670
}
671671
}
672672
}
673673
if (std::abs(posdau.tpcNSigmaPr()) < strangedEdxNSigma && std::abs(negdau.tpcNSigmaPi()) < strangedEdxNSigma) {
674-
if (doPPAnalysis && (v0.v0cosPA() > lambdaCospa)) {
674+
if (v0.v0cosPA() > lambdaCospa) {
675675
if (doPPAnalysis || (v0.distovertotmom(collision.posX(), collision.posY(), collision.posZ()) * o2::constants::physics::MassK0Short < lifetimecutLambda &&
676676
std::abs(v0.dcapostopv()) > dcapostopvLambda && std::abs(v0.dcanegtopv()) > dcanegtopvLambda)) {
677677
BIT_SET(compatibleLambda, 1);
678678
}
679679
}
680680
}
681681
if (std::abs(posdau.tpcNSigmaPr()) < strangedEdxNSigmaTight && std::abs(negdau.tpcNSigmaPi()) < strangedEdxNSigmaTight) {
682-
if (doPPAnalysis && (v0.v0cosPA() > lambdaCospa)) {
682+
if (v0.v0cosPA() > lambdaCospa) {
683683
if (doPPAnalysis || (v0.distovertotmom(collision.posX(), collision.posY(), collision.posZ()) * o2::constants::physics::MassK0Short < lifetimecutLambda &&
684684
std::abs(v0.dcapostopv()) > dcapostopvLambda && std::abs(v0.dcanegtopv()) > dcanegtopvLambda)) {
685685
BIT_SET(compatibleLambda, 2);
686686
}
687687
}
688688
}
689689
if (std::abs(posdau.tpcNSigmaPi()) < strangedEdxNSigmaLoose && std::abs(negdau.tpcNSigmaPr()) < strangedEdxNSigmaLoose) {
690-
if (doPPAnalysis && (v0.v0cosPA() > lambdaCospa)) {
690+
if (v0.v0cosPA() > lambdaCospa) {
691691
if (doPPAnalysis || (v0.distovertotmom(collision.posX(), collision.posY(), collision.posZ()) * o2::constants::physics::MassK0Short < lifetimecutLambda &&
692692
std::abs(v0.dcapostopv()) > dcapostopvAntiLambda && std::abs(v0.dcanegtopv()) > dcanegtopvAntiLambda)) {
693693
BIT_SET(compatibleAntiLambda, 0);
694694
}
695695
}
696696
}
697697
if (std::abs(posdau.tpcNSigmaPi()) < strangedEdxNSigma && std::abs(negdau.tpcNSigmaPr()) < strangedEdxNSigma) {
698-
if (doPPAnalysis && (v0.v0cosPA() > lambdaCospa)) {
698+
if (v0.v0cosPA() > lambdaCospa) {
699699
if (doPPAnalysis || (v0.distovertotmom(collision.posX(), collision.posY(), collision.posZ()) * o2::constants::physics::MassK0Short < lifetimecutLambda &&
700700
std::abs(v0.dcapostopv()) > dcapostopvAntiLambda && std::abs(v0.dcanegtopv()) > dcanegtopvAntiLambda)) {
701701
BIT_SET(compatibleAntiLambda, 1);
702702
}
703703
}
704704
}
705705
if (std::abs(posdau.tpcNSigmaPi()) < strangedEdxNSigmaTight && std::abs(negdau.tpcNSigmaPr()) < strangedEdxNSigmaTight) {
706-
if (doPPAnalysis && (v0.v0cosPA() > lambdaCospa)) {
706+
if (v0.v0cosPA() > lambdaCospa) {
707707
if (doPPAnalysis || (v0.distovertotmom(collision.posX(), collision.posY(), collision.posZ()) * o2::constants::physics::MassK0Short < lifetimecutLambda &&
708708
std::abs(v0.dcapostopv()) > dcapostopvAntiLambda && std::abs(v0.dcanegtopv()) > dcanegtopvAntiLambda)) {
709709
BIT_SET(compatibleAntiLambda, 2);
@@ -756,7 +756,7 @@ struct HStrangeCorrelationFilter {
756756
return;
757757
}
758758
}
759-
if (!doPPAnalysis || !isCollisionSelectedPbPb(collision))
759+
if (!doPPAnalysis && !isCollisionSelectedPbPb(collision))
760760
return;
761761
/// _________________________________________________
762762
/// Populate table with associated V0s
@@ -802,47 +802,47 @@ struct HStrangeCorrelationFilter {
802802
}
803803
}
804804
if (std::abs(posdau.tpcNSigmaPr()) < strangedEdxNSigmaLoose && std::abs(negdau.tpcNSigmaPi()) < strangedEdxNSigmaLoose) {
805-
if (doPPAnalysis && (v0.v0cosPA() > lambdaCospa)) {
805+
if (v0.v0cosPA() > lambdaCospa) {
806806
if (doPPAnalysis || (v0.distovertotmom(collision.posX(), collision.posY(), collision.posZ()) * o2::constants::physics::MassK0Short < lifetimecutLambda &&
807807
std::abs(v0.dcapostopv()) > dcapostopvLambda && std::abs(v0.dcanegtopv()) > dcanegtopvLambda)) {
808808
BIT_SET(compatibleLambda, 0);
809809
}
810810
}
811811
}
812812
if (std::abs(posdau.tpcNSigmaPr()) < strangedEdxNSigma && std::abs(negdau.tpcNSigmaPi()) < strangedEdxNSigma) {
813-
if (doPPAnalysis && (v0.v0cosPA() > lambdaCospa)) {
813+
if (v0.v0cosPA() > lambdaCospa) {
814814
if (doPPAnalysis || (v0.distovertotmom(collision.posX(), collision.posY(), collision.posZ()) * o2::constants::physics::MassK0Short < lifetimecutLambda &&
815815
std::abs(v0.dcapostopv()) > dcapostopvLambda && std::abs(v0.dcanegtopv()) > dcanegtopvLambda)) {
816816
BIT_SET(compatibleLambda, 1);
817817
}
818818
}
819819
}
820820
if (std::abs(posdau.tpcNSigmaPr()) < strangedEdxNSigmaTight && std::abs(negdau.tpcNSigmaPi()) < strangedEdxNSigmaTight) {
821-
if (doPPAnalysis && (v0.v0cosPA() > lambdaCospa)) {
821+
if (v0.v0cosPA() > lambdaCospa) {
822822
if (doPPAnalysis || (v0.distovertotmom(collision.posX(), collision.posY(), collision.posZ()) * o2::constants::physics::MassK0Short < lifetimecutLambda &&
823823
std::abs(v0.dcapostopv()) > dcapostopvLambda && std::abs(v0.dcanegtopv()) > dcanegtopvLambda)) {
824824
BIT_SET(compatibleLambda, 2);
825825
}
826826
}
827827
}
828828
if (std::abs(posdau.tpcNSigmaPi()) < strangedEdxNSigmaLoose && std::abs(negdau.tpcNSigmaPr()) < strangedEdxNSigmaLoose) {
829-
if (doPPAnalysis && (v0.v0cosPA() > lambdaCospa)) {
829+
if (v0.v0cosPA() > lambdaCospa) {
830830
if (doPPAnalysis || (v0.distovertotmom(collision.posX(), collision.posY(), collision.posZ()) * o2::constants::physics::MassK0Short < lifetimecutLambda &&
831831
std::abs(v0.dcapostopv()) > dcapostopvAntiLambda && std::abs(v0.dcanegtopv()) > dcanegtopvAntiLambda)) {
832832
BIT_SET(compatibleAntiLambda, 0);
833833
}
834834
}
835835
}
836836
if (std::abs(posdau.tpcNSigmaPi()) < strangedEdxNSigma && std::abs(negdau.tpcNSigmaPr()) < strangedEdxNSigma) {
837-
if (doPPAnalysis && (v0.v0cosPA() > lambdaCospa)) {
837+
if (v0.v0cosPA() > lambdaCospa) {
838838
if (doPPAnalysis || (v0.distovertotmom(collision.posX(), collision.posY(), collision.posZ()) * o2::constants::physics::MassK0Short < lifetimecutLambda &&
839839
std::abs(v0.dcapostopv()) > dcapostopvAntiLambda && std::abs(v0.dcanegtopv()) > dcanegtopvAntiLambda)) {
840840
BIT_SET(compatibleAntiLambda, 1);
841841
}
842842
}
843843
}
844844
if (std::abs(posdau.tpcNSigmaPi()) < strangedEdxNSigmaTight && std::abs(negdau.tpcNSigmaPr()) < strangedEdxNSigmaTight) {
845-
if (doPPAnalysis && (v0.v0cosPA() > lambdaCospa)) {
845+
if (v0.v0cosPA() > lambdaCospa) {
846846
if (doPPAnalysis || (v0.distovertotmom(collision.posX(), collision.posY(), collision.posZ()) * o2::constants::physics::MassK0Short < lifetimecutLambda &&
847847
std::abs(v0.dcapostopv()) > dcapostopvAntiLambda && std::abs(v0.dcanegtopv()) > dcanegtopvAntiLambda)) {
848848
BIT_SET(compatibleAntiLambda, 2);
@@ -905,7 +905,7 @@ struct HStrangeCorrelationFilter {
905905
return;
906906
}
907907
}
908-
if (!doPPAnalysis || !isCollisionSelectedPbPb(collision))
908+
if (!doPPAnalysis && !isCollisionSelectedPbPb(collision))
909909
return;
910910
/// _________________________________________________
911911
/// Step 3: Populate table with associated Cascades
@@ -927,7 +927,7 @@ struct HStrangeCorrelationFilter {
927927
continue;
928928
if (negTrackCast.tpcNClsCrossedRows() < minTPCNCrossedRows)
929929
continue;
930-
if (!doPPAnalysis || !CascadeSelectedPbPb(casc, collision.posX(), collision.posY(), collision.posZ()))
930+
if (!doPPAnalysis && !CascadeSelectedPbPb(casc, collision.posX(), collision.posY(), collision.posZ()))
931931
continue;
932932
// check dE/dx compatibility
933933
int compatibleXiMinus = 0;
@@ -1071,7 +1071,7 @@ struct HStrangeCorrelationFilter {
10711071
return;
10721072
}
10731073
}
1074-
if (!doPPAnalysis || !isCollisionSelectedPbPb(collision))
1074+
if (!doPPAnalysis && !isCollisionSelectedPbPb(collision))
10751075
return;
10761076
/// _________________________________________________
10771077
/// Step 3: Populate table with associated Cascades
@@ -1093,7 +1093,7 @@ struct HStrangeCorrelationFilter {
10931093
continue;
10941094
if (negTrackCast.tpcNClsCrossedRows() < minTPCNCrossedRows)
10951095
continue;
1096-
if (!doPPAnalysis || !CascadeSelectedPbPb(casc, collision.posX(), collision.posY(), collision.posZ()))
1096+
if (!doPPAnalysis && !CascadeSelectedPbPb(casc, collision.posX(), collision.posY(), collision.posZ()))
10971097
continue;
10981098

10991099
// check dE/dx compatibility

‎PWGLF/Tasks/Strangeness/hStrangeCorrelation.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -508,7 +508,7 @@ struct HStrangeCorrelation {
508508
return false;
509509
return true;
510510
}
511-
void fillCorrelationsV0(aod::TriggerTracks const& triggers, aod::AssocV0s const& assocs, float pvx, float pvy, float pvz, bool mixing, float mult)
511+
void fillCorrelationsV0(aod::TriggerTracks const& triggers, aod::AssocV0s const& assocs, bool mixing, float pvx, float pvy, float pvz, float mult)
512512
{
513513
for (auto const& triggerTrack : triggers) {
514514
if (doTriggPhysicalPrimary && !triggerTrack.mcPhysicalPrimary())

0 commit comments

Comments
 (0)