@@ -658,11 +658,15 @@ struct Kstarqa {
658658 return true ;
659659 }
660660 } else {
661+ <<<<<<< HEAD
661662<<<<<<< HEAD
662663 if (!configGp.isSquarePIDcut ) {
663664=======
664665 if (!isSquarePIDcut) {
665666>>>>>>> 935384c59 (added square PID cut)
667+ =======
668+ if (!configGp.isSquarePIDcut ) {
669+ >>>>>>> 2e2ba799d (added configurable group)
666670 if (candidate.hasTOF () && (std::pow (candidate.tofNSigmaPi () - configGp.shiftInNsigmaTOFPi , 2 ) + std::pow (candidate.tpcNSigmaPi (), 2 )) < (std::pow (configGp.nsigmaCutCombinedPi , 2 ))) {
667671 return true ;
668672 }
@@ -685,11 +689,15 @@ struct Kstarqa {
685689 return true ;
686690 }
687691 } else {
692+ <<<<<<< HEAD
688693<<<<<<< HEAD
689694 if (!configGp.isSquarePIDcut ) {
690695=======
691696 if (!isSquarePIDcut) {
692697>>>>>>> 935384c59 (added square PID cut)
698+ =======
699+ if (!configGp.isSquarePIDcut ) {
700+ >>>>>>> 2e2ba799d (added configurable group)
693701 if (candidate.hasTOF () && (std::pow (candidate.tofNSigmaKa () - configGp.shiftInNsigmaTOFKa , 2 ) + std::pow (candidate.tpcNSigmaKa (), 2 )) < (std::pow (configGp.nsigmaCutCombinedKa , 2 ))) {
694702 return true ;
695703 }
@@ -744,11 +752,15 @@ struct Kstarqa {
744752 return true ;
745753 }
746754 } else {
755+ <<<<<<< HEAD
747756<<<<<<< HEAD
748757 if (!configGp.isSquarePIDcut ) {
749758=======
750759 if (!isSquarePIDcut) {
751760>>>>>>> 935384c59 (added square PID cut)
761+ =======
762+ if (!configGp.isSquarePIDcut ) {
763+ >>>>>>> 2e2ba799d (added configurable group)
752764 if (candidate.hasTOF () && (std::pow (candidate.tofNSigmaPi () - configGp.shiftInNsigmaTOFPi , 2 ) + std::pow (candidate.tpcNSigmaPi (), 2 )) < (std::pow (configGp.nsigmaCutCombinedMID , 2 ))) {
753765 return true ;
754766 }
@@ -771,11 +783,15 @@ struct Kstarqa {
771783 return true ;
772784 }
773785 } else {
786+ <<<<<<< HEAD
774787<<<<<<< HEAD
775788 if (!configGp.isSquarePIDcut ) {
776789=======
777790 if (!isSquarePIDcut) {
778791>>>>>>> 935384c59 (added square PID cut)
792+ =======
793+ if (!configGp.isSquarePIDcut ) {
794+ >>>>>>> 2e2ba799d (added configurable group)
779795 if (candidate.hasTOF () && (std::pow (candidate.tofNSigmaKa () - configGp.shiftInNsigmaTOFKa , 2 ) + std::pow (candidate.tpcNSigmaKa (), 2 )) < (std::pow (configGp.nsigmaCutCombinedMID , 2 ))) {
780796 return true ;
781797 }
@@ -874,11 +890,15 @@ struct Kstarqa {
874890 return true ;
875891 }
876892 }
893+ <<<<<<< HEAD
877894<<<<<<< HEAD
878895 if (!configGp.isSquarePIDcut ) {
879896=======
880897 if (!isSquarePIDcut) {
881898>>>>>>> 935384c59 (added square PID cut)
899+ =======
900+ if (!configGp.isSquarePIDcut ) {
901+ >>>>>>> 2e2ba799d (added configurable group)
882902 if (candidate.pt () >= configGp.lowPtCutPID && std::abs (candidate.tpcNSigmaPi ()) < configGp.nsigmaCutTPCPi && candidate.hasTOF () && (std::pow (candidate.tofNSigmaPi () - configGp.shiftInNsigmaTOFPi , 2 ) + std::pow (candidate.tpcNSigmaPi (), 2 )) < (std::pow (configGp.nsigmaCutCombinedPi , 2 ))) {
883903 return true ;
884904 }
@@ -914,11 +934,15 @@ struct Kstarqa {
914934 return true ;
915935 }
916936 }
937+ <<<<<<< HEAD
917938<<<<<<< HEAD
918939 if (!configGp.isSquarePIDcut ) {
919940=======
920941 if (!isSquarePIDcut) {
921942>>>>>>> 935384c59 (added square PID cut)
943+ =======
944+ if (!configGp.isSquarePIDcut ) {
945+ >>>>>>> 2e2ba799d (added configurable group)
922946 if (candidate.pt () >= configGp.lowPtCutPID && candidate.hasTOF ()) {
923947 if (candidate.pt () < ptCut2 && std::abs (candidate.tpcNSigmaKa ()) < configGp.nsigmaCutTPCKa && (std::pow (candidate.tofNSigmaKa () - configGp.shiftInNsigmaTOFKa , 2 ) + std::pow (candidate.tpcNSigmaKa (), 2 )) < (std::pow (configGp.nsigmaCutCombinedKa , 2 ))) {
924948 return true ;
@@ -960,11 +984,15 @@ struct Kstarqa {
960984 return true ;
961985 }
962986 } else {
987+ <<<<<<< HEAD
963988<<<<<<< HEAD
964989 if (!configGp.isSquarePIDcut ) {
965990=======
966991 if (!isSquarePIDcut) {
967992>>>>>>> 935384c59 (added square PID cut)
993+ =======
994+ if (!configGp.isSquarePIDcut ) {
995+ >>>>>>> 2e2ba799d (added configurable group)
968996 if (candidate.hasTOF () && (std::pow (candidate.tofNSigmaPi () - configGp.shiftInNsigmaTOFPi , 2 ) + std::pow (candidate.tpcNSigmaPi (), 2 )) < (configGp.nsigmaCutCombinedPi * configGp.nsigmaCutCombinedPi )) {
969997 return true ;
970998 }
@@ -986,11 +1014,15 @@ struct Kstarqa {
9861014 return true ;
9871015 }
9881016 } else {
1017+ <<<<<<< HEAD
9891018<<<<<<< HEAD
9901019 if (!configGp.isSquarePIDcut ) {
9911020=======
9921021 if (!isSquarePIDcut) {
9931022>>>>>>> 935384c59 (added square PID cut)
1023+ =======
1024+ if (!configGp.isSquarePIDcut ) {
1025+ >>>>>>> 2e2ba799d (added configurable group)
9941026 if (candidate.hasTOF () && (std::pow (candidate.tofNSigmaKa () - configGp.shiftInNsigmaTOFKa , 2 ) + std::pow (candidate.tpcNSigmaKa (), 2 )) < (std::pow (configGp.nsigmaCutCombinedKa , 2 ))) {
9951027 return true ;
9961028 }
0 commit comments