@@ -514,11 +514,15 @@ struct Kstarqa {
514514 if (calcRotational && motherRot.Rapidity () < 0.5 )
515515 hInvMass.fill (HIST (" h3KstarInvMassRotated" ), multiplicity, motherRot.Pt (), motherRot.M (), cosThetaStarHelicityRot);
516516 }
517+ <<<<<<< HEAD
517518<<<<<<< HEAD
518519 } else if (isMix && std::abs (mother.Rapidity ()) < 0.5 ) {
519520=======
520521 } else if (std::abs (mother.Rapidity ()) < 0.5 ) {
521522>>>>>>> 2320e66c3 (applied rapidity cut for rotational mother)
523+ =======
524+ } else if (isMix && std::abs (mother.Rapidity ()) < 0.5 ) {
525+ >>>>>>> 71f0d52a7 (Code optimisation)
522526 hInvMass.fill (HIST (" h3KstarInvMassMixed" ), multiplicity, mother.Pt (), mother.M (), cosThetaStarHelicity);
523527 }
524528 } else {
@@ -545,11 +549,15 @@ struct Kstarqa {
545549 if (calcRotational && abs (motherRot.Rapidity ()) < 0.5 )
546550 hInvMass.fill (HIST (" h3KstarInvMassRotated" ), multiplicity, motherRot.Pt (), motherRot.M (), cosThetaStarProduction);
547551 }
552+ <<<<<<< HEAD
548553<<<<<<< HEAD
549554 } else if (isMix && std::abs (mother.Rapidity ()) < 0.5 ) {
550555=======
551556 } else if (std::abs (mother.Rapidity ()) < 0.5 ) {
552557>>>>>>> 2320e66c3 (applied rapidity cut for rotational mother)
558+ =======
559+ } else if (isMix && std::abs (mother.Rapidity ()) < 0.5 ) {
560+ >>>>>>> 71f0d52a7 (Code optimisation)
553561 hInvMass.fill (HIST (" h3KstarInvMassMixed" ), multiplicity, mother.Pt (), mother.M (), cosThetaStarProduction);
554562 }
555563 } else {
@@ -575,11 +583,15 @@ struct Kstarqa {
575583 if (calcRotational && std::abs (motherRot.Rapidity ()) < 0.5 )
576584 hInvMass.fill (HIST (" h3KstarInvMassRotated" ), multiplicity, motherRot.Pt (), motherRot.M (), cosThetaStarBeam);
577585 }
586+ <<<<<<< HEAD
578587<<<<<<< HEAD
579588 } else if (isMix && std::abs (mother.Rapidity ()) < 0.5 ) {
580589=======
581590 } else if (std::abs (mother.Rapidity ()) < 0.5 ) {
582591>>>>>>> 2320e66c3 (applied rapidity cut for rotational mother)
592+ =======
593+ } else if (isMix && std::abs (mother.Rapidity ()) < 0.5 ) {
594+ >>>>>>> 71f0d52a7 (Code optimisation)
583595 hInvMass.fill (HIST (" h3KstarInvMassMixed" ), multiplicity, mother.Pt (), mother.M (), cosThetaStarBeam);
584596 }
585597 } else {
@@ -606,11 +618,15 @@ struct Kstarqa {
606618 if (calcRotational && std::abs (motherRot.Rapidity ()) < 0.5 )
607619 hInvMass.fill (HIST (" h3KstarInvMassRotated" ), multiplicity, motherRot.Pt (), motherRot.M (), cosThetaStarRandom);
608620 }
621+ <<<<<<< HEAD
609622<<<<<<< HEAD
610623 } else if (isMix && std::abs (mother.Rapidity ()) < 0.5 ) {
611624=======
612625 } else if (std::abs (mother.Rapidity ()) < 0.5 ) {
613626>>>>>>> 2320e66c3 (applied rapidity cut for rotational mother)
627+ =======
628+ } else if (isMix && std::abs (mother.Rapidity ()) < 0.5 ) {
629+ >>>>>>> 71f0d52a7 (Code optimisation)
614630 hInvMass.fill (HIST (" h3KstarInvMassMixed" ), multiplicity, mother.Pt (), mother.M (), cosThetaStarRandom);
615631 }
616632 } else {
0 commit comments