File tree Expand file tree Collapse file tree 1 file changed +7
-0
lines changed
Expand file tree Collapse file tree 1 file changed +7
-0
lines changed Original file line number Diff line number Diff line change @@ -1846,10 +1846,17 @@ struct Kstarqa {
18461846 // if (!(track1PDG == PDG_t::kKPlus && track2PDG == PDG_t::kPiPlus)) {
18471847 // continue;
18481848 // }
1849+ <<<<<<< HEAD
18491850 if (selectionConfig.isPDGCheckMC && (track1PDG != PDG_t::kKPlus ) && (track1PDG != PDG_t::kPiPlus )) {
18501851 continue ;
18511852 }
18521853 if (selectionConfig.isPDGCheckMC && (track2PDG != PDG_t::kKPlus ) && (track2PDG != PDG_t::kPiPlus )) {
1854+ =======
1855+ if (selectionConfig.isPDGCheckMC && ((track1PDG != PDG_t::kKPlus ) || (track1PDG != PDG_t::kPiPlus ))) {
1856+ continue ;
1857+ }
1858+ if (selectionConfig.isPDGCheckMC && ((track2PDG != PDG_t::kKPlus ) || (track2PDG != PDG_t::kPiPlus ))) {
1859+ >>>>>>> 3eb28648a (added MID in MC)
18531860 continue ;
18541861 }
18551862 rEventSelection.fill (HIST (" recMCparticles" ), 6.5 );
You can’t perform that action at this time.
0 commit comments