@@ -145,11 +145,6 @@ struct JetShapeTask {
145145 registry.add (" trackTpcNClsFound" , " trackTpcNClsFound" , HistType::kTH1F , {{100 , 0 , 200 }});
146146 registry.add (" trackItsNCls" , " trackItsNCls" , HistType::kTH1F , {{10 , 0 , 10 }});
147147
148- registry.add (" jetTpcTofPi" , " jetTpcTofPi" , HistType::kTHnSparseD , {{nBinsPForCut.value , 0 , pMax.value }, {nBinsNSigma.value , nSigmaMin.value , nSigmaMax.value }, {nBinsDistance.value , 0 , distanceMax.value }, {nBinsJetPt.value , jetPtMinForCut.value , jetPtMaxForCut.value }, {nBinsCentrality.value , centralityMinForCut.value , centralityMaxForCut.value }});
149- registry.add (" jetTpcTofPr" , " jetTpcTofPr" , HistType::kTHnSparseD , {{nBinsPForCut.value , 0 , pMax.value }, {nBinsNSigma.value , nSigmaMin.value , nSigmaMax.value }, {nBinsDistance.value , 0 , distanceMax.value }, {nBinsJetPt.value , jetPtMinForCut.value , jetPtMaxForCut.value }, {nBinsCentrality.value , centralityMinForCut.value , centralityMaxForCut.value }});
150- registry.add (" tpcTofPiPerpJet" , " tpcTofPiPerpJet" , HistType::kTHnSparseD , {{nBinsPForCut.value , 0 , pMax.value }, {nBinsNSigma.value , nSigmaMin.value , nSigmaMax.value }, {nBinsDistance.value , 0 , distanceMax.value }, {nBinsJetPt.value , jetPtMinForCut.value , jetPtMaxForCut.value }, {nBinsCentrality.value , centralityMinForCut.value , centralityMaxForCut.value }});
151- registry.add (" tpcTofPrPerpJet" , " tpcTofPrPerpJet" , HistType::kTHnSparseD , {{nBinsPForCut.value , 0 , pMax.value }, {nBinsNSigma.value , nSigmaMin.value , nSigmaMax.value }, {nBinsDistance.value , 0 , distanceMax.value }, {nBinsJetPt.value , jetPtMinForCut.value , jetPtMaxForCut.value }, {nBinsCentrality.value , centralityMinForCut.value , centralityMaxForCut.value }});
152-
153148 registry.add (" jetTpcPi" , " jetTpcPi" , HistType::kTH2F , {{nBinsP.value , 0 , pMax.value }, {nBinsNSigma.value , nSigmaMin.value , nSigmaMax.value }});
154149 registry.add (" jetTofPi" , " jetTofPi" , HistType::kTH2F , {{nBinsPt.value , 0 , ptMax.value }, {nBinsNSigma.value , nSigmaMin.value , nSigmaMax.value }});
155150 registry.add (" jetTpcPr" , " jetTpcPr" , HistType::kTH2F , {{nBinsP.value , 0 , pMax.value }, {nBinsNSigma.value , nSigmaMin.value , nSigmaMax.value }});
@@ -159,22 +154,29 @@ struct JetShapeTask {
159154 registry.add (" tpcDedxPerpJet" , " tpcDedxPerpJet" , HistType::kTH2F , {{nBinsPForDedx.value , 0 , pMax.value }, {nBinsTpcDedx.value , 0 , 1000 }});
160155 registry.add (" jetTofBeta" , " jetTofBeta" , HistType::kTH2F , {{nBinsPForBeta.value , 0 , pMax.value }, {nBinsTofBeta.value , 0.4 , 1.1 }});
161156
157+ // Jet (in Cone)
158+ registry.add (" jetTpcTofPi" , " jetTpcTofPi" , HistType::kTHnSparseD , {{nBinsPForCut.value , 0 , pMax.value }, {nBinsNSigma.value , nSigmaMin.value , nSigmaMax.value }, {nBinsDistance.value , 0 , distanceMax.value }, {nBinsJetPt.value , jetPtMinForCut.value , jetPtMaxForCut.value }, {nBinsCentrality.value , centralityMinForCut.value , centralityMaxForCut.value }});
159+ registry.add (" jetTpcTofPr" , " jetTpcTofPr" , HistType::kTHnSparseD , {{nBinsPForCut.value , 0 , pMax.value }, {nBinsNSigma.value , nSigmaMin.value , nSigmaMax.value }, {nBinsDistance.value , 0 , distanceMax.value }, {nBinsJetPt.value , jetPtMinForCut.value , jetPtMaxForCut.value }, {nBinsCentrality.value , centralityMinForCut.value , centralityMaxForCut.value }});
162160 registry.add (" jetpVsPtForPr" , " jetpVsPtForPr" , HistType::kTHnSparseD , {{nBinsP.value , 0 , pMax.value }, {nBinsPt.value , 0 , ptMax.value }, {nBinsDistance.value , 0 , distanceMax.value }, {nBinsJetPt.value , jetPtMinForCut.value , jetPtMaxForCut.value }, {nBinsCentrality.value , centralityMinForCut.value , centralityMaxForCut.value }});
163161 registry.add (" jetpVsPtForPi" , " jetpVsPtPi" , HistType::kTHnSparseD , {{nBinsP.value , 0 , pMax.value }, {nBinsPt.value , 0 , ptMax.value }, {nBinsDistance.value , 0 , distanceMax.value }, {nBinsJetPt.value , jetPtMinForCut.value , jetPtMaxForCut.value }, {nBinsCentrality.value , centralityMinForCut.value , centralityMaxForCut.value }});
164- registry.add (" pVsPtForPrPerpJet" , " pVsPtForPrPerpJet" , HistType::kTHnSparseD , {{nBinsP.value , 0 , pMax.value }, {nBinsPt.value , 0 , ptMax.value }, {nBinsDistance.value , 0 , distanceMax.value }, {nBinsJetPt.value , jetPtMinForCut.value , jetPtMaxForCut.value }, {nBinsCentrality.value , centralityMinForCut.value , centralityMaxForCut.value }});
165- registry.add (" pVsPtForPiPerpJet" , " pVsPtPionPerpJet" , HistType::kTHnSparseD , {{nBinsP.value , 0 , pMax.value }, {nBinsPt.value , 0 , ptMax.value }, {nBinsDistance.value , 0 , distanceMax.value }, {nBinsJetPt.value , jetPtMinForCut.value , jetPtMaxForCut.value }, {nBinsCentrality.value , centralityMinForCut.value , centralityMaxForCut.value }});
166-
167162 registry.add (" jetDcaPr" , " jetDcaPr" , HistType::kTHnSparseD , {{nBinsPtForDca.value , 0 , ptMax.value }, {nBinsDcaxyForData.value , dcaxyMin.value , dcaxyMax.value }, {nBinsDistance.value , 0 , distanceMax.value }, {nBinsJetPt.value , jetPtMinForCut.value , jetPtMaxForCut.value }, {nBinsCentrality.value , centralityMinForCut.value , centralityMaxForCut.value }});
168163 registry.add (" jetDcaPi" , " jetDcaPi" , HistType::kTHnSparseD , {{nBinsPtForDca.value , 0 , ptMax.value }, {nBinsDcaxyForData.value , dcaxyMin.value , dcaxyMax.value }, {nBinsDistance.value , 0 , distanceMax.value }, {nBinsJetPt.value , jetPtMinForCut.value , jetPtMaxForCut.value }, {nBinsCentrality.value , centralityMinForCut.value , centralityMaxForCut.value }});
164+
165+ // Perp Cone
166+ registry.add (" tpcTofPiPerpJet" , " tpcTofPiPerpJet" , HistType::kTHnSparseD , {{nBinsPForCut.value , 0 , pMax.value }, {nBinsNSigma.value , nSigmaMin.value , nSigmaMax.value }, {nBinsDistance.value , 0 , distanceMax.value }, {nBinsJetPt.value , jetPtMinForCut.value , jetPtMaxForCut.value }, {nBinsCentrality.value , centralityMinForCut.value , centralityMaxForCut.value }});
167+ registry.add (" tpcTofPrPerpJet" , " tpcTofPrPerpJet" , HistType::kTHnSparseD , {{nBinsPForCut.value , 0 , pMax.value }, {nBinsNSigma.value , nSigmaMin.value , nSigmaMax.value }, {nBinsDistance.value , 0 , distanceMax.value }, {nBinsJetPt.value , jetPtMinForCut.value , jetPtMaxForCut.value }, {nBinsCentrality.value , centralityMinForCut.value , centralityMaxForCut.value }});
168+ registry.add (" pVsPtForPrPerpJet" , " pVsPtForPrPerpJet" , HistType::kTHnSparseD , {{nBinsP.value , 0 , pMax.value }, {nBinsPt.value , 0 , ptMax.value }, {nBinsDistance.value , 0 , distanceMax.value }, {nBinsJetPt.value , jetPtMinForCut.value , jetPtMaxForCut.value }, {nBinsCentrality.value , centralityMinForCut.value , centralityMaxForCut.value }});
169+ registry.add (" pVsPtForPiPerpJet" , " pVsPtPionPerpJet" , HistType::kTHnSparseD , {{nBinsP.value , 0 , pMax.value }, {nBinsPt.value , 0 , ptMax.value }, {nBinsDistance.value , 0 , distanceMax.value }, {nBinsJetPt.value , jetPtMinForCut.value , jetPtMaxForCut.value }, {nBinsCentrality.value , centralityMinForCut.value , centralityMaxForCut.value }});
169170 registry.add (" dcaPrPerpJet" , " dcaPrPerpJet" , HistType::kTHnSparseD , {{nBinsPtForDca.value , 0 , ptMax.value }, {nBinsDcaxyForData.value , dcaxyMin.value , dcaxyMax.value }, {nBinsDistance.value , 0 , distanceMax.value }, {nBinsJetPt.value , jetPtMinForCut.value , jetPtMaxForCut.value }, {nBinsCentrality.value , centralityMinForCut.value , centralityMaxForCut.value }});
170171 registry.add (" dcaPiPerpJet" , " dcaPiPerpJet" , HistType::kTHnSparseD , {{nBinsPtForDca.value , 0 , ptMax.value }, {nBinsDcaxyForData.value , dcaxyMin.value , dcaxyMax.value }, {nBinsDistance.value , 0 , distanceMax.value }, {nBinsJetPt.value , jetPtMinForCut.value , jetPtMaxForCut.value }, {nBinsCentrality.value , centralityMinForCut.value , centralityMaxForCut.value }});
171172
172- registry.add (" tpcTofPiRandCone" , " tpcTofPiRandCone" , HistType::kTHnSparseD , {{nBinsPForCut.value , 0 , pMax.value }, {nBinsNSigma.value , nSigmaMin.value , nSigmaMax.value }, {nBinsJetPt.value , jetPtMinForCut.value , jetPtMaxForCut.value }, {nBinsCentrality.value , centralityMinForCut.value , centralityMaxForCut.value }});
173- registry.add (" tpcTofPrRandCone" , " tpcTofPrRandCone" , HistType::kTHnSparseD , {{nBinsPForCut.value , 0 , pMax.value }, {nBinsNSigma.value , nSigmaMin.value , nSigmaMax.value }, {nBinsJetPt.value , jetPtMinForCut.value , jetPtMaxForCut.value }, {nBinsCentrality.value , centralityMinForCut.value , centralityMaxForCut.value }});
174- registry.add (" pVsPtForPrRandCone" , " pVsPtForPrRandCone" , HistType::kTHnSparseD , {{nBinsP.value , 0 , pMax.value }, {nBinsPt.value , 0 , ptMax.value }, {nBinsJetPt.value , jetPtMinForCut.value , jetPtMaxForCut.value }, {nBinsCentrality.value , centralityMinForCut.value , centralityMaxForCut.value }});
175- registry.add (" pVsPtForPiRandCone" , " pVsPtPionRandCone" , HistType::kTHnSparseD , {{nBinsP.value , 0 , pMax.value }, {nBinsPt.value , 0 , ptMax.value }, {nBinsJetPt.value , jetPtMinForCut.value , jetPtMaxForCut.value }, {nBinsCentrality.value , centralityMinForCut.value , centralityMaxForCut.value }});
176- registry.add (" dcaPrRandCone" , " dcaPrRandCone" , HistType::kTHnSparseD , {{nBinsPtForDca.value , 0 , ptMax.value }, {nBinsDcaxyForData.value , dcaxyMin.value , dcaxyMax.value }, {nBinsJetPt.value , jetPtMinForCut.value , jetPtMaxForCut.value }, {nBinsCentrality.value , centralityMinForCut.value , centralityMaxForCut.value }});
177- registry.add (" dcaPiRandCone" , " dcaPiRandCone" , HistType::kTHnSparseD , {{nBinsPtForDca.value , 0 , ptMax.value }, {nBinsDcaxyForData.value , dcaxyMin.value , dcaxyMax.value }, {nBinsJetPt.value , jetPtMinForCut.value , jetPtMaxForCut.value }, {nBinsCentrality.value , centralityMinForCut.value , centralityMaxForCut.value }});
173+ // Random Cone
174+ registry.add (" tpcTofPiRandCone" , " tpcTofPiRandCone" , HistType::kTHnSparseD , {{nBinsPForCut.value , 0 , pMax.value }, {nBinsNSigma.value , nSigmaMin.value , nSigmaMax.value }, {nBinsDistance.value , 0 , distanceMax.value }, {nBinsJetPt.value , jetPtMinForCut.value , jetPtMaxForCut.value }, {nBinsCentrality.value , centralityMinForCut.value , centralityMaxForCut.value }});
175+ registry.add (" tpcTofPrRandCone" , " tpcTofPrRandCone" , HistType::kTHnSparseD , {{nBinsPForCut.value , 0 , pMax.value }, {nBinsNSigma.value , nSigmaMin.value , nSigmaMax.value }, {nBinsDistance.value , 0 , distanceMax.value }, {nBinsJetPt.value , jetPtMinForCut.value , jetPtMaxForCut.value }, {nBinsCentrality.value , centralityMinForCut.value , centralityMaxForCut.value }});
176+ registry.add (" pVsPtForPrRandCone" , " pVsPtForPrRandCone" , HistType::kTHnSparseD , {{nBinsP.value , 0 , pMax.value }, {nBinsPt.value , 0 , ptMax.value }, {nBinsDistance.value , 0 , distanceMax.value }, {nBinsJetPt.value , jetPtMinForCut.value , jetPtMaxForCut.value }, {nBinsCentrality.value , centralityMinForCut.value , centralityMaxForCut.value }});
177+ registry.add (" pVsPtForPiRandCone" , " pVsPtPionRandCone" , HistType::kTHnSparseD , {{nBinsP.value , 0 , pMax.value }, {nBinsPt.value , 0 , ptMax.value }, {nBinsDistance.value , 0 , distanceMax.value }, {nBinsJetPt.value , jetPtMinForCut.value , jetPtMaxForCut.value }, {nBinsCentrality.value , centralityMinForCut.value , centralityMaxForCut.value }});
178+ registry.add (" dcaPrRandCone" , " dcaPrRandCone" , HistType::kTHnSparseD , {{nBinsPtForDca.value , 0 , ptMax.value }, {nBinsDcaxyForData.value , dcaxyMin.value , dcaxyMax.value }, {nBinsDistance.value , 0 , distanceMax.value }, {nBinsJetPt.value , jetPtMinForCut.value , jetPtMaxForCut.value }, {nBinsCentrality.value , centralityMinForCut.value , centralityMaxForCut.value }});
179+ registry.add (" dcaPiRandCone" , " dcaPiRandCone" , HistType::kTHnSparseD , {{nBinsPtForDca.value , 0 , ptMax.value }, {nBinsDcaxyForData.value , dcaxyMin.value , dcaxyMax.value }, {nBinsDistance.value , 0 , distanceMax.value }, {nBinsJetPt.value , jetPtMinForCut.value , jetPtMaxForCut.value }, {nBinsCentrality.value , centralityMinForCut.value , centralityMaxForCut.value }});
178180
179181 registry.add (" jetPt" , " jet pT;#it{p}_{T,jet} (GeV/#it{c});entries" , HistType::kTH2F , {{200 , 0 ., 200 .}, {nBinsCentrality.value , centralityMinForCut.value , centralityMaxForCut.value }});
180182 registry.add (" jetPtMc" , " MC jet pT;#it{p}_{T,jet} (GeV/#it{c});entries" , HistType::kTH2F , {{200 , 0 ., 200 .}, {nBinsCentrality.value , centralityMinForCut.value , centralityMaxForCut.value }});
@@ -193,7 +195,7 @@ struct JetShapeTask {
193195 registry.add (" eventCounterJetShape" , " eventCounterJetShape" , HistType::kTH1F , {{nBinsCentrality.value , centralityMinForCut.value , centralityMaxForCut.value }});
194196 registry.add (" eventCounterJet" , " eventCounterJet" , HistType::kTH1F , {{nBinsCentrality.value , centralityMinForCut.value , centralityMaxForCut.value }});
195197 registry.add (" eventCounterInc" , " eventCounterInc" , HistType::kTH1F , {{nBinsCentrality.value , centralityMinForCut.value , centralityMaxForCut.value }});
196- registry.add (" eventCounterRandCone" , " Number of Random Cones;Centrality (%);Count" , HistType::kTH1F , {{nBinsCentrality.value , centralityMinForCut.value , centralityMaxForCut.value }});
198+ registry.add (" eventCounterRandCone" , " Number of Random Cones;Centrality (%);Count" , HistType::kTH2F , {{nBinsJetPt. value , jetPtMinForCut. value , jetPtMaxForCut. value }, {nBinsCentrality.value , centralityMinForCut.value , centralityMaxForCut.value }});
197199 registry.add (" eventCounterMc" , " eventCounterMc" , HistType::kTH1F , {{nBinsCentrality.value , centralityMinForCut.value , centralityMaxForCut.value }});
198200
199201 registry.add (" ptVsCentrality" , " ptvscentrality" , HistType::kTH2F , {{100 , 0 , 100 }, {300 , 0 , 300 }});
@@ -545,7 +547,8 @@ struct JetShapeTask {
545547 }
546548
547549 if (isValidRC) {
548- registry.fill (HIST (" eventCounterRandCone" ), centrality);
550+ const auto & leadJet = cachedJets[0 ];
551+ registry.fill (HIST (" eventCounterRandCone" ), leadJet.ptCorr , centrality);
549552 }
550553 }
551554
@@ -659,23 +662,23 @@ struct JetShapeTask {
659662 // dcaXY
660663 if (track.hasTOF ()) {
661664 if (hasTofPr && isTpcPrRange) {
662- registry.fill (HIST (" dcaPrRandCone" ), trkPt, track.dcaXY (), leadJet.ptCorr , centrality);
665+ registry.fill (HIST (" dcaPrRandCone" ), trkPt, track.dcaXY (), distRC, leadJet.ptCorr , centrality);
663666 }
664667 if (hasTofPi && isTpcPiRange) {
665- registry.fill (HIST (" dcaPiRandCone" ), trkPt, track.dcaXY (), leadJet.ptCorr , centrality);
668+ registry.fill (HIST (" dcaPiRandCone" ), trkPt, track.dcaXY (), distRC, leadJet.ptCorr , centrality);
666669 }
667670 }
668671
669672 if (hasTofPi) {
670- registry.fill (HIST (" tpcTofPiRandCone" ), trkP, tpcPi, leadJet.ptCorr , centrality);
673+ registry.fill (HIST (" tpcTofPiRandCone" ), trkP, tpcPi, distRC, leadJet.ptCorr , centrality);
671674 if (isTpcPiRange) {
672- registry.fill (HIST (" pVsPtForPiRandCone" ), trkP, trkPt, leadJet.ptCorr , centrality);
675+ registry.fill (HIST (" pVsPtForPiRandCone" ), trkP, trkPt, distRC, leadJet.ptCorr , centrality);
673676 }
674677 }
675678 if (hasTofPr) {
676- registry.fill (HIST (" tpcTofPrRandCone" ), trkP, tpcPr, leadJet.ptCorr , centrality);
679+ registry.fill (HIST (" tpcTofPrRandCone" ), trkP, tpcPr, distRC, leadJet.ptCorr , centrality);
677680 if (isTpcPrRange) {
678- registry.fill (HIST (" pVsPtForPrRandCone" ), trkP, trkPt, leadJet.ptCorr , centrality);
681+ registry.fill (HIST (" pVsPtForPrRandCone" ), trkP, trkPt, distRC, leadJet.ptCorr , centrality);
679682 }
680683 }
681684 }
0 commit comments