@@ -69,6 +69,7 @@ struct V0QA {
6969
7070 Configurable<std::string> evSel{" evSel" , " sel8WithoutTimeFrameBorderCut" , " choose event selection" };
7171 Configurable<float > yPartMax{" yPartMax" , 0.5 , " Maximum rapidity of particles" };
72+ Configurable<float > etaV0Max{" etaV0Max" , 0.75 , " Maximum pseudorapidity of V0s" };
7273 Configurable<float > vertexZCut{" vertexZCut" , 10.0 , " Vertex Z cut" };
7374 Configurable<float > v0Fraction{" v0Fraction" , 1.0 , " Fraction of V0s to be kept inside jets" };
7475
@@ -265,6 +266,7 @@ struct V0QA {
265266 registry.add (" tests/weighted/AntiLambdaPtEtaPhi" , " AntiLambda Pt Eta Phi" , HistType::kTH3D , {axisV0Pt, axisEta, axisPhi});
266267
267268 registry.add (" tests/weighted/JetPtEtaPhi" , " Jet Pt, Eta, Phi" , HistType::kTH3D , {axisJetPt, axisEta, axisPhi});
269+ registry.add (" tests/weighted/inclJetPtEtaPhi" , " Jet Pt, Eta, Phi, inclusive jets" , HistType::kTH3D , {axisJetPt, axisEta, axisPhi});
268270 registry.add (" tests/weighted/JetPtEtaV0Pt" , " Jet Pt, Eta, V0 Pt" , HistType::kTH3D , {axisJetPt, axisEta, axisV0Pt});
269271 registry.add (" tests/weighted/JetPtEtaV0Z" , " Jet Pt, Eta, V0 Z" , HistType::kTH3D , {axisJetPt, axisEta, axisV0Z});
270272 registry.add (" tests/weighted/JetPtEtaK0SPt" , " Jet Pt, Eta, K0S Pt" , HistType::kTH3D , {axisJetPt, axisEta, axisV0Pt});
@@ -286,6 +288,7 @@ struct V0QA {
286288 registry.add (" tests/sub/AntiLambdaPtEtaPhi" , " AntiLambda Pt, Eta, Phi" , HistType::kTH3D , {axisV0Pt, axisEta, axisPhi});
287289
288290 registry.add (" tests/nosub/JetPtEtaPhi" , " Jet Pt, Eta, Phi" , HistType::kTH3D , {axisJetPt, axisEta, axisPhi});
291+ registry.add (" tests/nosub/inclJetPtEtaPhi" , " Jet Pt, Eta, Phi, inclusive jets" , HistType::kTH3D , {axisJetPt, axisEta, axisPhi});
289292 registry.add (" tests/nosub/JetPtEtaV0Pt" , " Jet Pt, Eta, V0 Pt" , HistType::kTH3D , {axisJetPt, axisEta, axisV0Pt});
290293 registry.add (" tests/nosub/JetPtEtaV0Z" , " Jet Pt, Eta, V0 Z" , HistType::kTH3D , {axisJetPt, axisEta, axisV0Z});
291294 registry.add (" tests/nosub/JetPtEtaK0SPt" , " Jet Pt, Eta, K0S Pt" , HistType::kTH3D , {axisJetPt, axisEta, axisV0Pt});
@@ -296,6 +299,7 @@ struct V0QA {
296299 registry.add (" tests/nosub/JetPtEtaAntiLambdaZ" , " Jet Pt, Eta, AntiLambda Z" , HistType::kTH3D , {axisJetPt, axisEta, axisV0Z});
297300
298301 registry.add (" tests/sub/JetPtEtaPhi" , " Jet Pt, Eta, Phi" , HistType::kTH3D , {axisJetPt, axisEta, axisPhi});
302+ registry.add (" tests/sub/JetPtEtaPhiAllV0sSubtracted" , " Jet Pt, Eta, Phi (All V0s Subtracted)" , HistType::kTH3D , {axisJetPt, axisEta, axisPhi});
299303 registry.add (" tests/sub/JetPtEtaV0Pt" , " Jet Pt, Eta, V0 Pt" , HistType::kTH3D , {axisJetPt, axisEta, axisV0Pt});
300304 registry.add (" tests/sub/JetPtEtaV0Z" , " Jet Pt, Eta, V0 Z" , HistType::kTH3D , {axisJetPt, axisEta, axisV0Z});
301305 registry.add (" tests/sub/JetPtEtaK0SPt" , " Jet Pt, Eta, K0S Pt" , HistType::kTH3D , {axisJetPt, axisEta, axisV0Pt});
@@ -331,10 +335,10 @@ struct V0QA {
331335 registry.add (" sharing/JetPtEtaPhiShared" , " JetPtEtaPhiShared" , HistType::kTH3D , {axisJetPt, axisEta, axisPhi});
332336 registry.add (" sharing/JetPtEtaPhiNoShared" , " JetPtEtaPhiNoShared" , HistType::kTH3D , {axisJetPt, axisEta, axisPhi});
333337
334- registry.add (" sharing/JetPtEtaV0Pt" , " JetPtEtaV0Pt" , HistType::kTH3D , {axisJetPt, axisEta, axisPhi });
335- registry.add (" sharing/JetPtEtaK0SPt" , " JetPtEtaK0SPt" , HistType::kTH3D , {axisJetPt, axisEta, axisPhi });
336- registry.add (" sharing/JetPtEtaLambdaPt" , " JetPtEtaLambdaPt" , HistType::kTH3D , {axisJetPt, axisEta, axisPhi });
337- registry.add (" sharing/JetPtEtaAntiLambdaPt" , " JetPtEtaAntiLambdaPt" , HistType::kTH3D , {axisJetPt, axisEta, axisPhi });
338+ registry.add (" sharing/JetPtEtaV0Pt" , " JetPtEtaV0Pt" , HistType::kTH3D , {axisJetPt, axisEta, axisV0Pt });
339+ registry.add (" sharing/JetPtEtaK0SPt" , " JetPtEtaK0SPt" , HistType::kTH3D , {axisJetPt, axisEta, axisV0Pt });
340+ registry.add (" sharing/JetPtEtaLambdaPt" , " JetPtEtaLambdaPt" , HistType::kTH3D , {axisJetPt, axisEta, axisV0Pt });
341+ registry.add (" sharing/JetPtEtaAntiLambdaPt" , " JetPtEtaAntiLambdaPt" , HistType::kTH3D , {axisJetPt, axisEta, axisV0Pt });
338342 registry.add (" sharing/JetPtEtaV0PtPt" , " JetPtEtaV0PtPt" , HistType::kTHnSparseD , {axisJetPt, axisEta, axisV0Pt, axisV0Pt});
339343 registry.add (" sharing/JetPtEtaV0PtPtDaughterPt" , " JetPtEtaV0PtPtDaughterPt" , HistType::kTHnSparseD , {axisJetPt, axisEta, axisV0Pt, axisV0Pt, axisV0Pt});
340344 registry.add (" sharing/JetK0SK0S" , " JetK0SK0S" , HistType::kTHnSparseD , {axisJetPt, axisEta, axisV0Pt, axisV0Pt});
@@ -741,7 +745,9 @@ struct V0QA {
741745 template <typename T>
742746 void fillWeightedJetFinderJet (T const & jet)
743747 {
744- registry.fill (HIST (" tests/weighted/JetPtEtaPhi" ), jet.pt (), jet.eta (), jet.phi ());
748+ registry.fill (HIST (" tests/weighted/inclJetPtEtaPhi" ), jet.pt (), jet.eta (), jet.phi ());
749+ if (jet.candidatesIds ().size () > 0 )
750+ registry.fill (HIST (" tests/weighted/JetPtEtaPhi" ), jet.pt (), jet.eta (), jet.phi ());
745751 }
746752
747753 template <typename T, typename U>
@@ -794,7 +800,9 @@ struct V0QA {
794800 template <typename T>
795801 void fillSubtractedJetFinderJetNoSubtraction (T const & jet)
796802 {
797- registry.fill (HIST (" tests/nosub/JetPtEtaPhi" ), jet.pt (), jet.eta (), jet.phi ());
803+ registry.fill (HIST (" tests/nosub/inclJetPtEtaPhi" ), jet.pt (), jet.eta (), jet.phi ());
804+ if (jet.candidatesIds ().size () > 0 )
805+ registry.fill (HIST (" tests/nosub/JetPtEtaPhi" ), jet.pt (), jet.eta (), jet.phi ());
798806 }
799807
800808 template <typename T, typename U>
@@ -818,9 +826,11 @@ struct V0QA {
818826 }
819827
820828 template <typename T>
821- void fillSubtractedJetFinderJetSubtracted (T const & jet, double ptjetsub)
829+ void fillSubtractedJetFinderJetSubtracted (T const & jet, double ptjetsub, bool allV0sSubtracted )
822830 {
823831 registry.fill (HIST (" tests/sub/JetPtEtaPhi" ), ptjetsub, jet.eta (), jet.phi ());
832+ if (allV0sSubtracted)
833+ registry.fill (HIST (" tests/sub/JetPtEtaPhiAllV0sSubtracted" ), ptjetsub, jet.eta (), jet.phi ());
824834 }
825835
826836 void fillSubtractedJetFinderV0InJetSubtracted (const double ptjetsub, const double etajet, const double v0Pt, const int v0Type)
@@ -1739,7 +1749,8 @@ struct V0QA {
17391749 }
17401750 } // V0s in jet loop
17411751
1742- fillSubtractedJetFinderJetSubtracted (jet, ptjetsub);
1752+ bool allV0sSubtracted = (v0Pt.size () == 0 );
1753+ fillSubtractedJetFinderJetSubtracted (jet, ptjetsub, allV0sSubtracted);
17431754 for (unsigned int i = 0 ; i < v0Pt.size (); ++i) {
17441755 fillSubtractedJetFinderV0InJetSubtracted (ptjetsub, jet.eta (), v0Pt[i], v0Type[i]);
17451756 } // Accepted V0s in jet loop
@@ -1759,12 +1770,18 @@ struct V0QA {
17591770 if (trigger.isRejectedCandidate ())
17601771 continue ;
17611772
1773+ if (abs (trigger.eta ()) > etaV0Max)
1774+ continue ;
1775+
17621776 fillV0DaughterSharingInclusive (trigger);
17631777
17641778 for (const auto & associate : v0s) {
17651779 if (associate.isRejectedCandidate ())
17661780 continue ;
17671781
1782+ if (abs (associate.eta ()) > etaV0Max)
1783+ continue ;
1784+
17681785 if (trigger == associate)
17691786 continue ;
17701787
0 commit comments