@@ -514,7 +514,11 @@ struct Kstarqa {
514514 if (calcRotational && motherRot.Rapidity () < 0.5 )
515515 hInvMass.fill (HIST (" h3KstarInvMassRotated" ), multiplicity, motherRot.Pt (), motherRot.M (), cosThetaStarHelicityRot);
516516 }
517+ <<<<<<< HEAD
517518 } else if (isMix && std::abs (mother.Rapidity ()) < 0.5 ) {
519+ =======
520+ } else if (std::abs (mother.Rapidity ()) < 0.5 ) {
521+ >>>>>>> 2320e66c3 (applied rapidity cut for rotational mother)
518522 hInvMass.fill (HIST (" h3KstarInvMassMixed" ), multiplicity, mother.Pt (), mother.M (), cosThetaStarHelicity);
519523 }
520524 } else {
@@ -541,7 +545,11 @@ struct Kstarqa {
541545 if (calcRotational && abs (motherRot.Rapidity ()) < 0.5 )
542546 hInvMass.fill (HIST (" h3KstarInvMassRotated" ), multiplicity, motherRot.Pt (), motherRot.M (), cosThetaStarProduction);
543547 }
548+ <<<<<<< HEAD
544549 } else if (isMix && std::abs (mother.Rapidity ()) < 0.5 ) {
550+ =======
551+ } else if (std::abs (mother.Rapidity ()) < 0.5 ) {
552+ >>>>>>> 2320e66c3 (applied rapidity cut for rotational mother)
545553 hInvMass.fill (HIST (" h3KstarInvMassMixed" ), multiplicity, mother.Pt (), mother.M (), cosThetaStarProduction);
546554 }
547555 } else {
@@ -567,7 +575,11 @@ struct Kstarqa {
567575 if (calcRotational && std::abs (motherRot.Rapidity ()) < 0.5 )
568576 hInvMass.fill (HIST (" h3KstarInvMassRotated" ), multiplicity, motherRot.Pt (), motherRot.M (), cosThetaStarBeam);
569577 }
578+ <<<<<<< HEAD
570579 } else if (isMix && std::abs (mother.Rapidity ()) < 0.5 ) {
580+ =======
581+ } else if (std::abs (mother.Rapidity ()) < 0.5 ) {
582+ >>>>>>> 2320e66c3 (applied rapidity cut for rotational mother)
571583 hInvMass.fill (HIST (" h3KstarInvMassMixed" ), multiplicity, mother.Pt (), mother.M (), cosThetaStarBeam);
572584 }
573585 } else {
@@ -594,7 +606,11 @@ struct Kstarqa {
594606 if (calcRotational && std::abs (motherRot.Rapidity ()) < 0.5 )
595607 hInvMass.fill (HIST (" h3KstarInvMassRotated" ), multiplicity, motherRot.Pt (), motherRot.M (), cosThetaStarRandom);
596608 }
609+ <<<<<<< HEAD
597610 } else if (isMix && std::abs (mother.Rapidity ()) < 0.5 ) {
611+ =======
612+ } else if (std::abs (mother.Rapidity ()) < 0.5 ) {
613+ >>>>>>> 2320e66c3 (applied rapidity cut for rotational mother)
598614 hInvMass.fill (HIST (" h3KstarInvMassMixed" ), multiplicity, mother.Pt (), mother.M (), cosThetaStarRandom);
599615 }
600616 } else {
0 commit comments