@@ -156,8 +156,10 @@ struct JetFinderQATask {
156156 registry.add (" h3_centrality_occupancy_jet_pt" , " centrality; occupancy; #it{p}_{T,jet} (GeV/#it{c})" , {HistType::kTH3F , {{120 , -10.0 , 110.0 }, {60 , 0 , 30000 }, jetPtAxis}});
157157 }
158158
159- if (doprocessJetsRhoAreaSubData || doprocessJetsRhoAreaSubMCD) {
159+ if (doprocessJetsRhoAreaSubData || doprocessJetsRhoAreaSubMCD || doprocessJetsRhoPerpSubData || doprocessJetsRhoPerpSubMCD ) {
160160
161+ registry.add (" h2_leadingjet_pt_rho" , " #it{p}_{T,leading jet} vs #rho (GeV/#it{c});#it{p}_{T,leading jet} (GeV/#it{c});#rho (GeV/#it{c})" , {HistType::kTH2F , {jetPtAxis, {1000 , 0.0 , 10.0 }}});
162+ registry.add (" h2_leadingjet_pt_rhoM" , " #it{p}_{T,leading jet} vs #rho_{M} (GeV/#it{c});#it{p}_{T,jet} (GeV/#it{c});#rho_{M} (GeV/#it{c})" , {HistType::kTH2F , {jetPtAxis, {1000 , 0.0 , 10.0 }}});
161163 registry.add (" h_jet_pt_rhoareasubtracted" , " jet pT;#it{p}_{T,jet} (GeV/#it{c});entries" , {HistType::kTH1F , {jetPtAxisRhoAreaSub}});
162164 registry.add (" h_jet_eta_rhoareasubtracted" , " jet #eta;#eta_{jet};entries" , {HistType::kTH1F , {jetEtaAxis}});
163165 registry.add (" h_jet_phi_rhoareasubtracted" , " jet #varphi;#varphi_{jet};entries" , {HistType::kTH1F , {{160 , -1.0 , 7 .}}});
@@ -200,19 +202,19 @@ struct JetFinderQATask {
200202 }
201203
202204 if (doprocessRho) {
203- registry.add (" h2_centrality_ntracks" , " ; centrality; N_{tracks};" , {HistType::kTH2F , {{1100 , 0 . , 110.0 }, {10000 , 0.0 , 10000.0 }}});
205+ registry.add (" h2_centrality_ntracks" , " ; centrality; N_{tracks};" , {HistType::kTH2F , {{1200 , - 10.0 , 110.0 }, {10000 , 0.0 , 10000.0 }}});
204206 registry.add (" h2_ntracks_rho" , " ; N_{tracks}; #it{rho} (GeV/area);" , {HistType::kTH2F , {{10000 , 0.0 , 10000.0 }, {400 , 0.0 , 400.0 }}});
205207 registry.add (" h2_ntracks_rhom" , " ; N_{tracks}; #it{rho}_{m} (GeV/area);" , {HistType::kTH2F , {{10000 , 0.0 , 10000.0 }, {100 , 0.0 , 100.0 }}});
206- registry.add (" h2_centrality_rho" , " ; centrality; #it{rho} (GeV/area);" , {HistType::kTH2F , {{1100 , 0 . , 110 .}, {400 , 0 ., 400.0 }}});
207- registry.add (" h2_centrality_rhom" , " ;centrality; #it{rho}_{m} (GeV/area)" , {HistType::kTH2F , {{1100 , 0 . , 110 .}, {100 , 0 ., 100.0 }}});
208+ registry.add (" h2_centrality_rho" , " ; centrality; #it{rho} (GeV/area);" , {HistType::kTH2F , {{1200 , - 10.0 , 110.0 }, {400 , 0 ., 400.0 }}});
209+ registry.add (" h2_centrality_rhom" , " ;centrality; #it{rho}_{m} (GeV/area)" , {HistType::kTH2F , {{1200 , - 10.0 , 110.0 }, {100 , 0 ., 100.0 }}});
208210 }
209211
210212 if (doprocessRandomConeData || doprocessRandomConeMCD) {
211- registry.add (" h2_centrality_rhorandomcone" , " ; centrality; #it{p}_{T,random cone} - #it{area, random cone} * #it{rho} (GeV/c);" , {HistType::kTH2F , {{1100 , 0 . , 110 .}, {800 , -400.0 , 400.0 }}});
212- registry.add (" h2_centrality_rhorandomconerandomtrackdirection" , " ; centrality; #it{p}_{T,random cone} - #it{area, random cone} * #it{rho} (GeV/c);" , {HistType::kTH2F , {{1100 , 0 . , 110 .}, {800 , -400.0 , 400.0 }}});
213- registry.add (" h2_centrality_rhorandomconewithoutleadingjet" , " ; centrality; #it{p}_{T,random cone} - #it{area, random cone} * #it{rho} (GeV/c);" , {HistType::kTH2F , {{1100 , 0 . , 110 .}, {800 , -400.0 , 400.0 }}});
214- registry.add (" h2_centrality_rhorandomconerandomtrackdirectionwithoutoneleadingjets" , " ; centrality; #it{p}_{T,random cone} - #it{area, random cone} * #it{rho} (GeV/c);" , {HistType::kTH2F , {{1100 , 0 . , 110 .}, {800 , -400.0 , 400.0 }}});
215- registry.add (" h2_centrality_rhorandomconerandomtrackdirectionwithouttwoleadingjets" , " ; centrality; #it{p}_{T,random cone} - #it{area, random cone} * #it{rho} (GeV/c);" , {HistType::kTH2F , {{1100 , 0 . , 110 .}, {800 , -400.0 , 400.0 }}});
213+ registry.add (" h2_centrality_rhorandomcone" , " ; centrality; #it{p}_{T,random cone} - #it{area, random cone} * #it{rho} (GeV/c);" , {HistType::kTH2F , {{1200 , - 10.0 , 110.0 }, {800 , -400.0 , 400.0 }}});
214+ registry.add (" h2_centrality_rhorandomconerandomtrackdirection" , " ; centrality; #it{p}_{T,random cone} - #it{area, random cone} * #it{rho} (GeV/c);" , {HistType::kTH2F , {{1200 , - 10.0 , 110.0 }, {800 , -400.0 , 400.0 }}});
215+ registry.add (" h2_centrality_rhorandomconewithoutleadingjet" , " ; centrality; #it{p}_{T,random cone} - #it{area, random cone} * #it{rho} (GeV/c);" , {HistType::kTH2F , {{1200 , - 10.0 , 110.0 }, {800 , -400.0 , 400.0 }}});
216+ registry.add (" h2_centrality_rhorandomconerandomtrackdirectionwithoutoneleadingjets" , " ; centrality; #it{p}_{T,random cone} - #it{area, random cone} * #it{rho} (GeV/c);" , {HistType::kTH2F , {{1200 , - 10.0 , 110.0 }, {800 , -400.0 , 400.0 }}});
217+ registry.add (" h2_centrality_rhorandomconerandomtrackdirectionwithouttwoleadingjets" , " ; centrality; #it{p}_{T,random cone} - #it{area, random cone} * #it{rho} (GeV/c);" , {HistType::kTH2F , {{1200 , - 10.0 , 110.0 }, {800 , -400.0 , 400.0 }}});
216218 }
217219
218220 if (doprocessJetsMCP || doprocessJetsMCPWeighted) {
@@ -664,29 +666,30 @@ struct JetFinderQATask {
664666 }
665667 }
666668 }
667- }
668-
669- registry.fill (HIST (" h2_centrality_rhorandomconewithoutleadingjet" ), collision.centrality (), randomConePt - M_PI * randomConeR * randomConeR * collision.rho ());
670669
671- // randomised eta,phi for tracks, to assess part of fluctuations coming from statistically independently emitted particles, removing tracks from 2 leading jets
672- double randomConePtWithoutOneLeadJet = 0 ;
673- double randomConePtWithoutTwoLeadJet = 0 ;
674- for (auto const & track : tracks) {
675- if (jetderiveddatautilities::selectTrack (track, trackSelection)) {
676- float dPhi = RecoDecay::constrainAngle (randomNumber.Uniform (0.0 , 2 * M_PI) - randomConePhi, static_cast <float >(-M_PI)); // ignores actual phi of track
677- float dEta = randomNumber.Uniform (trackEtaMin, trackEtaMax) - randomConeEta; // ignores actual eta of track
678- if (TMath::Sqrt (dEta * dEta + dPhi * dPhi) < randomConeR) {
679- if (!trackIsInJet (track, jets.iteratorAt (0 ))) {
680- randomConePtWithoutOneLeadJet += track.pt ();
681- if (!trackIsInJet (track, jets.iteratorAt (1 ))) {
682- randomConePtWithoutTwoLeadJet += track.pt ();
670+ registry.fill (HIST (" h2_centrality_rhorandomconewithoutleadingjet" ), collision.centrality (), randomConePt - M_PI * randomConeR * randomConeR * collision.rho ());
671+
672+ // randomised eta,phi for tracks, to assess part of fluctuations coming from statistically independently emitted particles, removing tracks from 2 leading jets
673+ double randomConePtWithoutOneLeadJet = 0 ;
674+ double randomConePtWithoutTwoLeadJet = 0 ;
675+ for (auto const & track : tracks) {
676+ if (jetderiveddatautilities::selectTrack (track, trackSelection)) {
677+ float dPhi = RecoDecay::constrainAngle (randomNumber.Uniform (0.0 , 2 * M_PI) - randomConePhi, static_cast <float >(-M_PI)); // ignores actual phi of track
678+ float dEta = randomNumber.Uniform (trackEtaMin, trackEtaMax) - randomConeEta; // ignores actual eta of track
679+ if (TMath::Sqrt (dEta * dEta + dPhi * dPhi) < randomConeR) {
680+ if (!trackIsInJet (track, jets.iteratorAt (0 ))) {
681+ randomConePtWithoutOneLeadJet += track.pt ();
682+ if (jets.size () > 1 && !trackIsInJet (track, jets.iteratorAt (1 ))) {
683+ randomConePtWithoutTwoLeadJet += track.pt ();
684+ }
683685 }
684686 }
685687 }
686688 }
689+
690+ registry.fill (HIST (" h2_centrality_rhorandomconerandomtrackdirectionwithoutoneleadingjets" ), collision.centrality (), randomConePtWithoutOneLeadJet - M_PI * randomConeR * randomConeR * collision.rho ());
691+ registry.fill (HIST (" h2_centrality_rhorandomconerandomtrackdirectionwithouttwoleadingjets" ), collision.centrality (), randomConePtWithoutTwoLeadJet - M_PI * randomConeR * randomConeR * collision.rho ());
687692 }
688- registry.fill (HIST (" h2_centrality_rhorandomconerandomtrackdirectionwithoutoneleadingjets" ), collision.centrality (), randomConePtWithoutOneLeadJet - M_PI * randomConeR * randomConeR * collision.rho ());
689- registry.fill (HIST (" h2_centrality_rhorandomconerandomtrackdirectionwithouttwoleadingjets" ), collision.centrality (), randomConePtWithoutTwoLeadJet - M_PI * randomConeR * randomConeR * collision.rho ());
690693 }
691694
692695 void processJetsData (soa::Filtered<aod::JetCollisions>::iterator const & collision, soa::Join<aod::ChargedJets, aod::ChargedJetConstituents> const & jets, aod::JetTracks const &)
@@ -713,13 +716,19 @@ struct JetFinderQATask {
713716 if (collision.trackOccupancyInTimeRange () < trackOccupancyInTimeRangeMin || trackOccupancyInTimeRangeMax < collision.trackOccupancyInTimeRange ()) {
714717 return ;
715718 }
719+ bool leadingJetFilled = false ;
716720 for (auto jet : jets) {
717721 if (!jetfindingutilities::isInEtaAcceptance (jet, jetEtaMin, jetEtaMax, trackEtaMin, trackEtaMax)) {
718722 continue ;
719723 }
720724 if (!isAcceptedJet<aod::JetTracks>(jet)) {
721725 continue ;
722726 }
727+ if (!leadingJetFilled) {
728+ registry.fill (HIST (" h2_leadingjet_pt_rho" ), jet.pt (), collision.rho ());
729+ registry.fill (HIST (" h2_leadingjet_pt_rhoM" ), jet.pt (), collision.rhoM ());
730+ leadingJetFilled = true ;
731+ }
723732 fillRhoAreaSubtractedHistograms (jet, collision.centrality (), collision.trackOccupancyInTimeRange (), collision.rho ());
724733 }
725734 }
@@ -732,18 +741,74 @@ struct JetFinderQATask {
732741 if (collision.trackOccupancyInTimeRange () < trackOccupancyInTimeRangeMin || trackOccupancyInTimeRangeMax < collision.trackOccupancyInTimeRange ()) {
733742 return ;
734743 }
744+ bool leadingJetFilled = false ;
735745 for (auto jet : jets) {
736746 if (!jetfindingutilities::isInEtaAcceptance (jet, jetEtaMin, jetEtaMax, trackEtaMin, trackEtaMax)) {
737747 continue ;
738748 }
739749 if (!isAcceptedJet<aod::JetTracks>(jet)) {
740750 continue ;
741751 }
752+ if (!leadingJetFilled) {
753+ registry.fill (HIST (" h2_leadingjet_pt_rho" ), jet.pt (), collision.rho ());
754+ registry.fill (HIST (" h2_leadingjet_pt_rhoM" ), jet.pt (), collision.rhoM ());
755+ leadingJetFilled = true ;
756+ }
742757 fillRhoAreaSubtractedHistograms (jet, collision.centrality (), collision.trackOccupancyInTimeRange (), collision.rho ());
743758 }
744759 }
745760 PROCESS_SWITCH (JetFinderQATask, processJetsRhoAreaSubMCD, " jet finder QA for rho-area subtracted mcd jets" , false );
746761
762+ void processJetsRhoPerpSubData (soa::Filtered<soa::Join<aod::JetCollisions, aod::BkgChargedPerpRhos>>::iterator const & collision,
763+ soa::Join<aod::ChargedJets, aod::ChargedJetConstituents> const & jets,
764+ aod::JetTracks const &)
765+ {
766+ if (collision.trackOccupancyInTimeRange () < trackOccupancyInTimeRangeMin || trackOccupancyInTimeRangeMax < collision.trackOccupancyInTimeRange ()) {
767+ return ;
768+ }
769+ bool leadingJetFilled = false ;
770+ for (auto jet : jets) {
771+ if (!jetfindingutilities::isInEtaAcceptance (jet, jetEtaMin, jetEtaMax, trackEtaMin, trackEtaMax)) {
772+ continue ;
773+ }
774+ if (!isAcceptedJet<aod::JetTracks>(jet)) {
775+ continue ;
776+ }
777+ if (!leadingJetFilled) {
778+ registry.fill (HIST (" h2_leadingjet_pt_rho" ), jet.pt (), collision.rho ());
779+ registry.fill (HIST (" h2_leadingjet_pt_rhoM" ), jet.pt (), collision.rhoM ());
780+ leadingJetFilled = true ;
781+ }
782+ fillRhoAreaSubtractedHistograms (jet, collision.centrality (), collision.trackOccupancyInTimeRange (), collision.rho ());
783+ }
784+ }
785+ PROCESS_SWITCH (JetFinderQATask, processJetsRhoPerpSubData, " jet finder QA for rho-perpendicular-cone subtracted jets" , false );
786+
787+ void processJetsRhoPerpSubMCD (soa::Filtered<soa::Join<aod::JetCollisions, aod::BkgChargedPerpRhos>>::iterator const & collision,
788+ soa::Join<aod::ChargedMCDetectorLevelJets, aod::ChargedMCDetectorLevelJetConstituents> const & jets,
789+ aod::JetTracks const &)
790+ {
791+ if (collision.trackOccupancyInTimeRange () < trackOccupancyInTimeRangeMin || trackOccupancyInTimeRangeMax < collision.trackOccupancyInTimeRange ()) {
792+ return ;
793+ }
794+ bool leadingJetFilled = false ;
795+ for (auto jet : jets) {
796+ if (!jetfindingutilities::isInEtaAcceptance (jet, jetEtaMin, jetEtaMax, trackEtaMin, trackEtaMax)) {
797+ continue ;
798+ }
799+ if (!isAcceptedJet<aod::JetTracks>(jet)) {
800+ continue ;
801+ }
802+ if (!leadingJetFilled) {
803+ registry.fill (HIST (" h2_leadingjet_pt_rho" ), jet.pt (), collision.rho ());
804+ registry.fill (HIST (" h2_leadingjet_pt_rhoM" ), jet.pt (), collision.rhoM ());
805+ leadingJetFilled = true ;
806+ }
807+ fillRhoAreaSubtractedHistograms (jet, collision.centrality (), collision.trackOccupancyInTimeRange (), collision.rho ());
808+ }
809+ }
810+ PROCESS_SWITCH (JetFinderQATask, processJetsRhoPerpSubMCD, " jet finder QA for rho-perpendicular-cone subtracted mcd jets" , false );
811+
747812 void processEvtWiseConstSubJetsData (soa::Filtered<aod::JetCollisions>::iterator const & collision, soa::Join<aod::ChargedEventWiseSubtractedJets, aod::ChargedEventWiseSubtractedJetConstituents> const & jets, aod::JetTracksSub const &)
748813 {
749814 if (collision.trackOccupancyInTimeRange () < trackOccupancyInTimeRangeMin || trackOccupancyInTimeRangeMax < collision.trackOccupancyInTimeRange ()) {
0 commit comments