@@ -384,6 +384,7 @@ struct Kstarqa {
384384
385385 hInvMass.add (" CorrFactors/h2dGenKstar" , " Centrality vs p_{T}" , kTH2D , {{101 , 0 .0f , 101 .0f }, ptAxis});
386386 hInvMass.add (" CorrFactors/h3dGenKstarVsMultMCVsMultiplicity" , " MC centrality vs centrality vs p_{T}" , kTH3D , {axisNch, {101 , 0 .0f , 101 .0f }, ptAxis});
387+ <<<<<<< HEAD
387388<<<<<<< HEAD
388389 hInvMass.add (" CorrFactors/hSignalLossDenominator" , " Kstar generated before event selection" , kTH2F , {{ptAxis}, {axisNch}});
389390 hInvMass.add (" CorrFactors/hSignalLossNumerator" , " Kstar generated after event selection" , kTH2F , {{ptAxis}, {axisNch}});
@@ -395,6 +396,12 @@ struct Kstarqa {
395396 hInvMass.add (" CorrFactors/MultiplicityRec" , " Multiplicity in generated MC with at least 1 reconstruction" , kTH1F , {multiplicityAxis});
396397 hInvMass.add (" CorrFactors/MultiplicityGen" , " Multiplicity in generated MC" , kTH1F , {multiplicityAxis});
397398>>>>>>> 087e3b03d (different event/signal loss method)
399+ =======
400+ hInvMass.add (" CorrFactors/hSignalLossDenominator3D" , " Kstar generated before event selection" , kTH3F , {{ptAxis}, {multiplicityAxis}, axisNch});
401+ hInvMass.add (" CorrFactors/hSignalLossNumerator3D" , " Kstar generated after event selection" , kTH3F , {{ptAxis}, {multiplicityAxis}, axisNch});
402+ hInvMass.add (" CorrFactors/MultiplicityRec2D" , " Multiplicity in generated MC with at least 1 reconstruction" , kTH2F , {{multiplicityAxis}, axisNch});
403+ hInvMass.add (" CorrFactors/MultiplicityGen2D" , " Multiplicity in generated MC" , kTH2F , {{multiplicityAxis}, axisNch});
404+ >>>>>>> 2ddf06887 (minor fix to code)
398405 }
399406
400407 rEventSelection.add (" tracksCheckData" , " No. of events in the data" , kTH1I , {{10 , 0 , 10 }});
@@ -1621,11 +1628,15 @@ struct Kstarqa {
16211628 }
16221629 }
16231630
1631+ <<<<<<< HEAD
16241632<<<<<<< HEAD
16251633 if (std::abs (mcCollision.posZ ()) > selectionConfig.cutzvertex ) {
16261634=======
16271635 if (std::abs (mcCollision.posZ ()) < selectionConfig.cutzvertex ) {
16281636>>>>>>> 38263c335 (added another method for event/signal loss corrections)
1637+ =======
1638+ if (std::abs (mcCollision.posZ ()) > selectionConfig.cutzvertex ) {
1639+ >>>>>>> 2ddf06887 (minor fix to code)
16291640 return ;
16301641 }
16311642
@@ -1822,6 +1833,7 @@ struct Kstarqa {
18221833 // auto multiplicityGen = -1;
18231834 // multiplicityGen = mcCollision.centFT0M();
18241835
1836+ <<<<<<< HEAD
18251837 hInvMass.fill (HIST (" CorrFactors/hMultiplicityVsMultMC" ), multiplicity, multiplicityNch);
18261838 hInvMass.fill (HIST (" CorrFactors/hNrecInGen" ), collisions.size ());
18271839<<<<<<< HEAD
@@ -1833,6 +1845,13 @@ struct Kstarqa {
18331845 if (isSelectedEvent) {
18341846 hInvMass.fill (HIST (" CorrFactors/MultiplicityRec" ), multiplicity);
18351847>>>>>>> 087e3b03d (different event/signal loss method)
1848+ =======
1849+ hInvMass.fill (HIST (" CorrFactors/hMultiplicityVsMultMC" ), multiplicity, mcCollision.multMCNParticlesEta08 ());
1850+ hInvMass.fill (HIST (" CorrFactors/hNrecInGen" ), collisions.size ());
1851+ hInvMass.fill (HIST (" CorrFactors/MultiplicityGen2D" ), multiplicity, mcCollision.multMCNParticlesEta08 ());
1852+ if (isSelectedEvent) {
1853+ hInvMass.fill (HIST (" CorrFactors/MultiplicityRec2D" ), multiplicity, mcCollision.multMCNParticlesEta08 ());
1854+ >>>>>>> 2ddf06887 (minor fix to code)
18361855 }
18371856
18381857 for (const auto & mcParticle : mcParticles) {
@@ -1885,10 +1904,14 @@ struct Kstarqa {
18851904 hInvMass.fill (HIST (" CorrFactors/hSignalLossNumerator" ), mother.pt (), multiplicityNch);
18861905=======
18871906 hInvMass.fill (HIST (" CorrFactors/h3dGenKstarVsMultMCVsMultiplicity" ), mcCollision.multMCNParticlesEta08 (), multiplicity, mother.Pt ());
1888- hInvMass.fill (HIST (" CorrFactors/hSignalLossDenominator " ), mother.pt (), multiplicity);
1907+ hInvMass.fill (HIST (" CorrFactors/hSignalLossDenominator3D " ), mother.pt (), multiplicity, mcCollision. multMCNParticlesEta08 () );
18891908 if (isSelectedEvent) {
1909+ <<<<<<< HEAD
18901910 hInvMass.fill (HIST (" CorrFactors/hSignalLossNumerator" ), mother.pt (), multiplicity);
18911911>>>>>>> 087e3b03d (different event/signal loss method)
1912+ =======
1913+ hInvMass.fill (HIST (" CorrFactors/hSignalLossNumerator3D" ), mother.pt (), multiplicity, mcCollision.multMCNParticlesEta08 ());
1914+ >>>>>>> 2ddf06887 (minor fix to code)
18921915 }
18931916 }
18941917 }
0 commit comments