@@ -51,8 +51,11 @@ struct JetShapeTask {
5151 Configurable<int > nBinsTofBeta{" nBinsTofBeta" , 350 , " Number of Beta bins" };
5252 Configurable<float > pMax{" pMax" , 7 .0f , " Max value of p" };
5353 Configurable<float > ptMax{" ptMax" , 5 .0f , " Max value of pT" };
54+ Configurable<float > jetPtMinForCut{" jetPtMinForCut" , 0 .0f , " Minimum value of jet pT cut" };
55+ Configurable<float > jetPtMaxForCut{" jetPtMaxForCut" , 200 .0f , " Maximum value of the jet pT cut" };
5456 Configurable<int > nBinsP{" nBinsP" , 70 , " Number of p bins" };
5557 Configurable<int > nBinsPt{" nBinsPt" , 50 , " Number of pT bins" };
58+ Configurable<int > nBinsJetPt{" nBinsJetPt" , 10 , " Number of jet pT bins" };
5659 Configurable<int > nBinsDistance{" nBinsDistance" , 7 , " Number of distance bins" };
5760 Configurable<float > distanceMax{" distanceMax" , 0 .7f , " Max value of distance" };
5861 Configurable<float > nSigmaTofCut{" nSigmaTofCut" , 2 .0f , " Number of sigma cut for TOF PID" };
@@ -62,21 +65,21 @@ struct JetShapeTask {
6265 Configurable<float > tpcNSigmaPiMax{" tpcNSigmaPiMax" , 3 .5f , " Max value of tpcNsigmaPion" };
6366
6467 HistogramRegistry registry{" registry" ,
65- {{" tpcTofPi" , " tpcTofPi" , {HistType::kTHnSparseD , {{35 , 0 , pMax}, {nBinsNSigma, nSigmaMin, nSigmaMax}, {nBinsDistance, 0 , distanceMax}}}},
66- {" tpcTofPr" , " tpcTofPr" , {HistType::kTHnSparseD , {{35 , 0 , pMax}, {nBinsNSigma, nSigmaMin, nSigmaMax}, {nBinsDistance, 0 , distanceMax}}}},
67- {" tpcTofPiOutOfJet" , " tpcTofPiOutOfJet" , {HistType::kTH2F , {{35 , 0 , pMax}, {nBinsNSigma, nSigmaMin, nSigmaMax}}}},
68- {" tpcTofPrOutOfJet" , " tpcTofPrOutOfJet" , {HistType::kTH2F , {{35 , 0 , pMax}, {nBinsNSigma, nSigmaMin, nSigmaMax}}}},
68+ {{" tpcTofPi" , " tpcTofPi" , {HistType::kTHnSparseD , {{35 , 0 , pMax}, {nBinsNSigma, nSigmaMin, nSigmaMax}, {nBinsDistance, 0 , distanceMax}, {nBinsJetPt, jetPtMinForCut, jetPtMaxForCut} }}},
69+ {" tpcTofPr" , " tpcTofPr" , {HistType::kTHnSparseD , {{35 , 0 , pMax}, {nBinsNSigma, nSigmaMin, nSigmaMax}, {nBinsDistance, 0 , distanceMax}, {nBinsJetPt, jetPtMinForCut, jetPtMaxForCut} }}},
70+ {" tpcTofPiOutOfJet" , " tpcTofPiOutOfJet" , {HistType::kTHnSparseD , {{35 , 0 , pMax}, {nBinsNSigma, nSigmaMin, nSigmaMax}, {nBinsJetPt, jetPtMinForCut, jetPtMaxForCut }}}},
71+ {" tpcTofPrOutOfJet" , " tpcTofPrOutOfJet" , {HistType::kTHnSparseD , {{35 , 0 , pMax}, {nBinsNSigma, nSigmaMin, nSigmaMax}, {nBinsJetPt, jetPtMinForCut, jetPtMaxForCut }}}},
6972 {" tpcPi" , " tpcPi" , {HistType::kTH2F , {{nBinsP, 0 , pMax}, {nBinsNSigma, nSigmaMin, nSigmaMax}}}},
7073 {" tofPi" , " tofPi" , {HistType::kTH2F , {{nBinsPt, 0 , ptMax}, {nBinsNSigma, nSigmaMin, nSigmaMax}}}},
7174 {" tpcPr" , " tpcPr" , {HistType::kTH2F , {{nBinsP, 0 , pMax}, {nBinsNSigma, nSigmaMin, nSigmaMax}}}},
7275 {" tofPr" , " tofPr" , {HistType::kTH2F , {{nBinsPt, 0 , ptMax}, {nBinsNSigma, nSigmaMin, nSigmaMax}}}},
7376 {" tpcDedx" , " tpcDedx" , {HistType::kTHnSparseD , {{nBinsPForDedx, 0 , pMax}, {nBinsTpcDedx, 0 , 1000 }, {nBinsDistance, 0 , distanceMax}}}},
7477 {" tpcDedxOutOfJet" , " tpcDedxOutOfJet" , {HistType::kTH2F , {{nBinsPForDedx, 0 , pMax}, {nBinsTpcDedx, 0 , 1000 }}}},
7578 {" tofBeta" , " tofBeta" , {HistType::kTH2F , {{nBinsPForBeta, 0 , pMax}, {nBinsTofBeta, 0.4 , 1.1 }}}},
76- {" pVsPtForPr" , " pVsPtForPr" , {HistType::kTHnSparseD , {{nBinsP, 0 , pMax}, {nBinsPt, 0 , ptMax}, {nBinsDistance, 0 , distanceMax}}}},
77- {" pVsPtForPi" , " pVsPtPi" , {HistType::kTHnSparseD , {{nBinsP, 0 , pMax}, {nBinsPt, 0 , ptMax}, {nBinsDistance, 0 , distanceMax}}}},
78- {" pVsPtForPrOutOfJet" , " pVsPtForPrOutOfJet" , {HistType::kTH2F , {{nBinsP, 0 , pMax}, {nBinsPt, 0 , ptMax}}}},
79- {" pVsPtForPiOutOfJet" , " pVsPtPionOutOfJet" , {HistType::kTH2F , {{nBinsP, 0 , pMax}, {nBinsPt, 0 , ptMax}}}},
79+ {" pVsPtForPr" , " pVsPtForPr" , {HistType::kTHnSparseD , {{nBinsP, 0 , pMax}, {nBinsPt, 0 , ptMax}, {nBinsDistance, 0 , distanceMax}, {nBinsJetPt, jetPtMinForCut, jetPtMaxForCut} }}},
80+ {" pVsPtForPi" , " pVsPtPi" , {HistType::kTHnSparseD , {{nBinsP, 0 , pMax}, {nBinsPt, 0 , ptMax}, {nBinsDistance, 0 , distanceMax}, {nBinsJetPt, jetPtMinForCut, jetPtMaxForCut} }}},
81+ {" pVsPtForPrOutOfJet" , " pVsPtForPrOutOfJet" , {HistType::kTHnSparseD , {{nBinsP, 0 , pMax}, {nBinsPt, 0 , ptMax}, {nBinsJetPt, jetPtMinForCut, jetPtMaxForCut }}}},
82+ {" pVsPtForPiOutOfJet" , " pVsPtPionOutOfJet" , {HistType::kTHnSparseD , {{nBinsP, 0 , pMax}, {nBinsPt, 0 , ptMax}, {nBinsJetPt, jetPtMinForCut, jetPtMaxForCut }}}},
8083 {" tofMass" , " tofMass" , {HistType::kTH1F , {{300 , 0 , 3 }}}},
8184 {" trackPhi" , " trackPhi" , {HistType::kTH1F , {{80 , -1 , 7 }}}},
8285 {" trackEta" , " trackEta" , {HistType::kTH1F , {{100 , -1 , 1 }}}},
@@ -152,20 +155,20 @@ struct JetShapeTask {
152155 template <typename T, typename U>
153156 bool isAcceptedJet (U const & jet)
154157 {
155- static constexpr double kJetAreaFractionMinValue = -98.0 ;
156- if (jetAreaFractionMin > kJetAreaFractionMinValue ) {
158+ static constexpr double JetAreaFractionMinValue = -98.0 ;
159+ if (jetAreaFractionMin > JetAreaFractionMinValue ) {
157160 if (jet.area () < jetAreaFractionMin * o2::constants::math::PI * (jet.r () / 100.0 ) * (jet.r () / 100.0 )) {
158161 return false ;
159162 }
160163 if (jet.area () < o2::constants::math::PIHalf * (jet.r () / 100.0 ) * (jet.r () / 100.0 )) {
161164 return false ;
162165 }
163166 }
164- static constexpr double kLeadingConstituentPtMinValue = 5.0 ;
165- static constexpr double kLeadingConstituentPtMaxValue = 9998.0 ;
167+ static constexpr double LeadingConstituentPtMinValue = 5.0 ;
168+ static constexpr double LeadingConstituentPtMaxValue = 9998.0 ;
166169 bool checkConstituentPt = true ;
167- bool checkConstituentMinPt = (leadingConstituentPtMin > kLeadingConstituentPtMinValue );
168- bool checkConstituentMaxPt = (leadingConstituentPtMax < kLeadingConstituentPtMaxValue );
170+ bool checkConstituentMinPt = (leadingConstituentPtMin > LeadingConstituentPtMinValue );
171+ bool checkConstituentMaxPt = (leadingConstituentPtMax < LeadingConstituentPtMaxValue );
169172 if (!checkConstituentMinPt && !checkConstituentMaxPt) {
170173 checkConstituentPt = false ;
171174 }
@@ -349,15 +352,15 @@ struct JetShapeTask {
349352 registry.fill (HIST (" tpcDedxOutOfJet" ), track.p (), track.tpcSignal ());
350353
351354 if (std::abs (track.tofNSigmaPi ()) < nSigmaTofCut) {
352- registry.fill (HIST (" tpcTofPiOutOfJet" ), track.p (), track.tpcNSigmaPi ());
355+ registry.fill (HIST (" tpcTofPiOutOfJet" ), track.p (), track.tpcNSigmaPi (), jet. pt () );
353356 if (track.tpcNSigmaPi () > tpcNSigmaPiMin && track.tpcNSigmaPi () < tpcNSigmaPiMax) {
354- registry.fill (HIST (" pVsPtForPiOutOfJet" ), track.p (), track.pt ());
357+ registry.fill (HIST (" pVsPtForPiOutOfJet" ), track.p (), track.pt (), jet. pt () );
355358 }
356359 }
357360 if (std::abs (track.tofNSigmaPr ()) < nSigmaTofCut) {
358- registry.fill (HIST (" tpcTofPrOutOfJet" ), track.p (), track.tpcNSigmaPr ());
361+ registry.fill (HIST (" tpcTofPrOutOfJet" ), track.p (), track.tpcNSigmaPr (), jet. pt () );
359362 if (track.tpcNSigmaPr () > tpcNSigmaPrMin && track.tpcNSigmaPr () < tpcNSigmaPrMax) {
360- registry.fill (HIST (" pVsPtForPrOutOfJet" ), track.p (), track.pt ());
363+ registry.fill (HIST (" pVsPtForPrOutOfJet" ), track.p (), track.pt (), jet. pt () );
361364 }
362365 }
363366 }
@@ -367,16 +370,16 @@ struct JetShapeTask {
367370 registry.fill (HIST (" tofBeta" ), track.p (), track.beta ());
368371
369372 if (std::abs (track.tofNSigmaPr ()) < nSigmaTofCut) {
370- registry.fill (HIST (" tpcTofPr" ), track.p (), track.tpcNSigmaPr (), distance);
373+ registry.fill (HIST (" tpcTofPr" ), track.p (), track.tpcNSigmaPr (), distance, jet. pt () );
371374 if (track.tpcNSigmaPr () > tpcNSigmaPrMin && track.tpcNSigmaPr () < tpcNSigmaPrMax) {
372- registry.fill (HIST (" pVsPtForPr" ), track.p (), track.pt (), distance);
375+ registry.fill (HIST (" pVsPtForPr" ), track.p (), track.pt (), distance, jet. pt () );
373376 }
374377 }
375378
376379 if (std::abs (track.tofNSigmaPi ()) < nSigmaTofCut) {
377- registry.fill (HIST (" tpcTofPi" ), track.p (), track.tpcNSigmaPi (), distance);
380+ registry.fill (HIST (" tpcTofPi" ), track.p (), track.tpcNSigmaPi (), distance, jet. pt () );
378381 if (track.tpcNSigmaPi () > tpcNSigmaPiMin && track.tpcNSigmaPi () < tpcNSigmaPiMax) {
379- registry.fill (HIST (" pVsPtForPi" ), track.p (), track.pt (), distance);
382+ registry.fill (HIST (" pVsPtForPi" ), track.p (), track.pt (), distance, jet. pt () );
380383 }
381384 }
382385 }
0 commit comments