@@ -658,7 +658,11 @@ struct Kstarqa {
658658 return true ;
659659 }
660660 } else {
661+ <<<<<<< HEAD
661662 if (!configGp.isSquarePIDcut ) {
663+ =======
664+ if (!isSquarePIDcut) {
665+ >>>>>>> 935384c59 (added square PID cut)
662666 if (candidate.hasTOF () && (std::pow (candidate.tofNSigmaPi () - configGp.shiftInNsigmaTOFPi , 2 ) + std::pow (candidate.tpcNSigmaPi (), 2 )) < (std::pow (configGp.nsigmaCutCombinedPi , 2 ))) {
663667 return true ;
664668 }
@@ -681,7 +685,11 @@ struct Kstarqa {
681685 return true ;
682686 }
683687 } else {
688+ <<<<<<< HEAD
684689 if (!configGp.isSquarePIDcut ) {
690+ =======
691+ if (!isSquarePIDcut) {
692+ >>>>>>> 935384c59 (added square PID cut)
685693 if (candidate.hasTOF () && (std::pow (candidate.tofNSigmaKa () - configGp.shiftInNsigmaTOFKa , 2 ) + std::pow (candidate.tpcNSigmaKa (), 2 )) < (std::pow (configGp.nsigmaCutCombinedKa , 2 ))) {
686694 return true ;
687695 }
@@ -736,7 +744,11 @@ struct Kstarqa {
736744 return true ;
737745 }
738746 } else {
747+ <<<<<<< HEAD
739748 if (!configGp.isSquarePIDcut ) {
749+ =======
750+ if (!isSquarePIDcut) {
751+ >>>>>>> 935384c59 (added square PID cut)
740752 if (candidate.hasTOF () && (std::pow (candidate.tofNSigmaPi () - configGp.shiftInNsigmaTOFPi , 2 ) + std::pow (candidate.tpcNSigmaPi (), 2 )) < (std::pow (configGp.nsigmaCutCombinedMID , 2 ))) {
741753 return true ;
742754 }
@@ -759,7 +771,11 @@ struct Kstarqa {
759771 return true ;
760772 }
761773 } else {
774+ <<<<<<< HEAD
762775 if (!configGp.isSquarePIDcut ) {
776+ =======
777+ if (!isSquarePIDcut) {
778+ >>>>>>> 935384c59 (added square PID cut)
763779 if (candidate.hasTOF () && (std::pow (candidate.tofNSigmaKa () - configGp.shiftInNsigmaTOFKa , 2 ) + std::pow (candidate.tpcNSigmaKa (), 2 )) < (std::pow (configGp.nsigmaCutCombinedMID , 2 ))) {
764780 return true ;
765781 }
@@ -858,7 +874,11 @@ struct Kstarqa {
858874 return true ;
859875 }
860876 }
877+ <<<<<<< HEAD
861878 if (!configGp.isSquarePIDcut ) {
879+ =======
880+ if (!isSquarePIDcut) {
881+ >>>>>>> 935384c59 (added square PID cut)
862882 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 ))) {
863883 return true ;
864884 }
@@ -894,7 +914,11 @@ struct Kstarqa {
894914 return true ;
895915 }
896916 }
917+ <<<<<<< HEAD
897918 if (!configGp.isSquarePIDcut ) {
919+ =======
920+ if (!isSquarePIDcut) {
921+ >>>>>>> 935384c59 (added square PID cut)
898922 if (candidate.pt () >= configGp.lowPtCutPID && candidate.hasTOF ()) {
899923 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 ))) {
900924 return true ;
@@ -936,7 +960,11 @@ struct Kstarqa {
936960 return true ;
937961 }
938962 } else {
963+ <<<<<<< HEAD
939964 if (!configGp.isSquarePIDcut ) {
965+ =======
966+ if (!isSquarePIDcut) {
967+ >>>>>>> 935384c59 (added square PID cut)
940968 if (candidate.hasTOF () && (std::pow (candidate.tofNSigmaPi () - configGp.shiftInNsigmaTOFPi , 2 ) + std::pow (candidate.tpcNSigmaPi (), 2 )) < (configGp.nsigmaCutCombinedPi * configGp.nsigmaCutCombinedPi )) {
941969 return true ;
942970 }
@@ -958,7 +986,11 @@ struct Kstarqa {
958986 return true ;
959987 }
960988 } else {
989+ <<<<<<< HEAD
961990 if (!configGp.isSquarePIDcut ) {
991+ =======
992+ if (!isSquarePIDcut) {
993+ >>>>>>> 935384c59 (added square PID cut)
962994 if (candidate.hasTOF () && (std::pow (candidate.tofNSigmaKa () - configGp.shiftInNsigmaTOFKa , 2 ) + std::pow (candidate.tpcNSigmaKa (), 2 )) < (std::pow (configGp.nsigmaCutCombinedKa , 2 ))) {
963995 return true ;
964996 }
0 commit comments