From 308828ffe7b414460700e4f21a392d79549d4a10 Mon Sep 17 00:00:00 2001 From: joachimckh Date: Wed, 29 Jan 2025 13:09:55 +0100 Subject: [PATCH 1/2] Change particle level. Added pure det lvl process function. Added centrality to geo matched --- PWGJE/Tasks/jetSpectraEseTask.cxx | 203 +++++++++++++++++------------- 1 file changed, 115 insertions(+), 88 deletions(-) diff --git a/PWGJE/Tasks/jetSpectraEseTask.cxx b/PWGJE/Tasks/jetSpectraEseTask.cxx index a5b0d6dde6a..88f06c19cb2 100644 --- a/PWGJE/Tasks/jetSpectraEseTask.cxx +++ b/PWGJE/Tasks/jetSpectraEseTask.cxx @@ -60,8 +60,6 @@ struct JetSpectraEseTask { Configurable eventSelections{"eventSelections", "sel8FullPbPb", "choose event selection"}; Configurable trackSelections{"trackSelections", "globalTracks", "set track selections"}; - Configurable fColSwitch{"fColSwitch", 0, "collision switch"}; - Configurable cfgEvSelOccupancy{"cfgEvSelOccupancy", false, "Flag for occupancy cut"}; Configurable> cfgCutOccupancy{"cfgCutOccupancy", {0, 1000}, "Occupancy cut"}; Configurable> cfgOccupancyPtCut{"cfgOccupancyPtCut", {0, 100}, "pT cut"}; @@ -103,77 +101,82 @@ struct JetSpectraEseTask { LOGF(info, "jetSpectraEse::init()"); - switch (fColSwitch) { - case 0: - LOGF(info, "JetSpectraEseTask::init() - using data"); - registry.add("hEventCounter", "event status;event status;entries", {HistType::kTH1F, {{10, 0.0, 10.0}}}); - registry.add("hCentralityMult", ";Centrality;entries", {HistType::kTH1F, {{100, 0, 100}}}); - registry.add("hJetPt", "jet pT;#it{p}_{T,jet} (GeV/#it{c});entries", {HistType::kTH1F, {{jetPtAxis}}}); - registry.add("hJetPt_bkgsub", "jet pT background sub;#it{p}_{T,jet} (GeV/#it{c});entries", {HistType::kTH1F, {{jetPtAxis}}}); - registry.add("hJetEta", "jet #eta;#eta_{jet};entries", {HistType::kTH1F, {{100, -1.0, 1.0}}}); - registry.add("hJetPhi", "jet #phi;#phi_{jet};entries", {HistType::kTH1F, {{80, -1.0, 7.}}}); - registry.add("hRho", ";#rho;entries", {HistType::kTH1F, {{100, 0, 200.}}}); - registry.add("hJetArea", ";area_{jet};entries", {HistType::kTH1F, {{100, 0, 10.}}}); - registry.add("hdPhi", "#Delta#phi;entries;", {HistType::kTH1F, {{dPhiAxis}}}); - registry.add("hCentJetPtdPhiq2", "", {HistType::kTHnSparseF, {{100, 0, 100}, {jetPtAxis}, {dPhiAxis}, {eseAxis}}}); - registry.add("hPsi2FT0C", ";Centrality; #Psi_{2}", {HistType::kTH2F, {{100, 0, 100}, {150, -2.5, 2.5}}}); - registry.addClone("hPsi2FT0C", "hPsi2FT0A"); - registry.addClone("hPsi2FT0C", "hPsi2FV0A"); - registry.addClone("hPsi2FT0C", "hPsi2TPCpos"); - registry.addClone("hPsi2FT0C", "hPsi2TPCneg"); - - registry.add("hCosPsi2AmC", ";Centrality;cos(2(#Psi_{2}^{A}-#Psi_{2}^{B}));#it{q}_{2}", {HistType::kTH3F, {{100, 0, 100}, {cosAxis}, {eseAxis}}}); - registry.addClone("hCosPsi2AmC", "hCosPsi2AmB"); - registry.addClone("hCosPsi2AmC", "hCosPsi2BmC"); - - registry.add("hQvecUncorV2", ";Centrality;Q_x;Q_y", {HistType::kTH3F, {{100, 0, 100}, {qvecAxis}, {qvecAxis}}}); - registry.addClone("hQvecUncorV2", "hQvecRectrV2"); - registry.addClone("hQvecUncorV2", "hQvecTwistV2"); - registry.addClone("hQvecUncorV2", "hQvecFinalV2"); - - registry.addClone("hPsi2FT0C", "hEPUncorV2"); - registry.addClone("hPsi2FT0C", "hEPRectrV2"); - registry.addClone("hPsi2FT0C", "hEPTwistV2"); - - break; - case 1: - LOGF(info, "JetSpectraEseTask::init() - using MC"); - registry.add("hMCEventCounter", "event status;event status;entries", {HistType::kTH1F, {{10, 0.0, 10.0}}}); - registry.add("hMCPureEventCounter", "event status;event status;entries", {HistType::kTH1F, {{10, 0.0, 10.0}}}); - registry.add("hMCDMatchedEventCounter", "event status;event status;entries", {HistType::kTH1F, {{10, 0.0, 10.0}}}); - registry.add("hCentralityMult", ";Centrality;entries", {HistType::kTH1F, {{100, 0, 100}}}); - registry.add("hPartJetPt", "particle level jet pT;#it{p}_{T,jet part} (GeV/#it{c});entries", {HistType::kTH1F, {{jetPtAxis}}}); - registry.add("hPartJetPtSubBkg", "particle level jet pT;#it{p}_{T,jet part} (GeV/#it{c});entries", {HistType::kTH1F, {{jetPtAxis}}}); - registry.add("hPartJetEta", "particle level jet #eta;#eta_{jet part};entries", {HistType::kTH1F, {{100, -1.0, 1.0}}}); - registry.add("hPartJetPhi", "particle level jet #phi;#phi_{jet part};entries", {HistType::kTH1F, {{80, -1.0, 7.}}}); - registry.add("hPartJetPtMatch", "particle level jet pT;#it{p}_{T,jet part} (GeV/#it{c});entries", {HistType::kTH1F, {{jetPtAxis}}}); - registry.add("hPartJetPtMatchSubBkg", "particle level jet pT;#it{p}_{T,jet part} (GeV/#it{c});entries", {HistType::kTH1F, {{jetPtAxis}}}); - registry.add("hPartJetEtaMatch", "particle level jet #eta;#eta_{jet part};entries", {HistType::kTH1F, {{100, -1.0, 1.0}}}); - registry.add("hPartJetPhiMatch", "particle level jet #phi;#phi_{jet part};entries", {HistType::kTH1F, {{80, -1.0, 7.}}}); - registry.add("hDetectorJetPt", "detector level jet pT;#it{p}_{T,jet det} (GeV/#it{c});entries", {HistType::kTH1F, {{jetPtAxis}}}); - registry.add("hDetectorJetPtSubBkg", "detector level jet pT;#it{p}_{T,jet det} (GeV/#it{c});entries", {HistType::kTH1F, {{jetPtAxis}}}); - registry.add("hDetectorJetEta", "detector level jet #eta;#eta_{jet det};entries", {HistType::kTH1F, {{100, -1.0, 1.0}}}); - registry.add("hDetectorJetPhi", "detector level jet #phi;#phi_{jet det};entries", {HistType::kTH1F, {{80, -1.0, 7.}}}); - registry.add("hMatchedJetsPtDelta", "#it{p}_{T,jet part}; det - part", {HistType::kTH2F, {{jetPtAxis}, {200, -20., 20.0}}}); - registry.add("hMatchedJetsPtDeltaSubBkg", "#it{p}_{T,jet part}; det - part", {HistType::kTH2F, {{jetPtAxis}, {200, -20., 20.0}}}); - registry.add("hGenMatchedJetsPtDeltadPt", "#it{p}_{T,jet part}; det - part / part", {HistType::kTHnSparseF, {{100, 0, 100}, {jetPtAxis}, {200, -20., 20.0}}}); - registry.add("hRecoMatchedJetsPtDeltadPt", "#it{p}_{T,jet det}; det - part / det", {HistType::kTHnSparseF, {{100, 0, 100}, {jetPtAxis}, {200, -20., 20.0}}}); - registry.add("hMatchedJetsEtaDelta", "#eta_{jet part}; det - part", {HistType::kTH2F, {{100, -1.0, 1.0}, {200, -0.8, 0.8}}}); - registry.add("hMatchedJetsPhiDelta", "#phi_{jet part}; det - part", {HistType::kTH2F, {{80, -1.0, 7.}, {200, -10.0, 10.}}}); - registry.add("hRespMcDMcPMatch", ";Centrality,#it{p}_{T, jet det}; #it{p}_{T, jet part}", HistType::kTHnSparseF, {{100, 0, 100}, jetPtAxis, jetPtAxis}); - registry.add("hRespMcDMcPMatchSubBkg", ";Centrality,#it{p}_{T, jet det}; #it{p}_{T, jet part}", HistType::kTHnSparseF, {{100, 0, 100}, jetPtAxis, jetPtAxis}); - break; - case 2: - LOGF(info, "JetSpectraEseTask::init() - using Occupancy processing"); - registry.add("hEventCounterOcc", "event status;event status;entries", {HistType::kTH1F, {{10, 0.0, 10.0}}}); - registry.add("hTrackPt", "track pT;#it{p}_{T,track} (GeV/#it{c});entries", {HistType::kTHnSparseF, {{100, 0, 100}, {100, 0, 100}, {eseAxis}, {occAxis}}}); - registry.add("hTrackEta", "track #eta;#eta_{track};entries", {HistType::kTH3F, {{100, 0, 100}, {100, -1.0, 1.0}, {occAxis}}}); - registry.add("hTrackPhi", "track #phi;#phi_{track};entries", {HistType::kTH3F, {{100, 0, 100}, {80, -1.0, 7.}, {occAxis}}}); - registry.add("hOccupancy", "Occupancy;Occupancy;entries", {HistType::kTH1F, {{occAxis}}}); - registry.add("hPsiOccupancy", "Occupancy;#Psi_{2};entries", {HistType::kTH3F, {{100, 0, 100}, {150, -2.5, 2.5}, {occAxis}}}); - break; + if (doprocessESEDataCharged) { + LOGF(info, "JetSpectraEseTask::init() - processESEDataCharged"); + registry.add("hEventCounter", "event status;event status;entries", {HistType::kTH1F, {{10, 0.0, 10.0}}}); + registry.add("hCentralityMult", ";Centrality;entries", {HistType::kTH1F, {{100, 0, 100}}}); + registry.add("hJetPt", "jet pT;#it{p}_{T,jet} (GeV/#it{c});entries", {HistType::kTH1F, {{jetPtAxis}}}); + registry.add("hJetPt_bkgsub", "jet pT background sub;#it{p}_{T,jet} (GeV/#it{c});entries", {HistType::kTH1F, {{jetPtAxis}}}); + registry.add("hJetEta", "jet #eta;#eta_{jet};entries", {HistType::kTH1F, {{100, -1.0, 1.0}}}); + registry.add("hJetPhi", "jet #phi;#phi_{jet};entries", {HistType::kTH1F, {{80, -1.0, 7.}}}); + registry.add("hRho", ";#rho;entries", {HistType::kTH1F, {{100, 0, 200.}}}); + registry.add("hJetArea", ";area_{jet};entries", {HistType::kTH1F, {{100, 0, 10.}}}); + registry.add("hdPhi", "#Delta#phi;entries;", {HistType::kTH1F, {{dPhiAxis}}}); + registry.add("hCentJetPtdPhiq2", "", {HistType::kTHnSparseF, {{100, 0, 100}, {jetPtAxis}, {dPhiAxis}, {eseAxis}}}); + registry.add("hPsi2FT0C", ";Centrality; #Psi_{2}", {HistType::kTH2F, {{100, 0, 100}, {150, -2.5, 2.5}}}); + registry.addClone("hPsi2FT0C", "hPsi2FT0A"); + registry.addClone("hPsi2FT0C", "hPsi2FV0A"); + registry.addClone("hPsi2FT0C", "hPsi2TPCpos"); + registry.addClone("hPsi2FT0C", "hPsi2TPCneg"); + registry.add("hCosPsi2AmC", ";Centrality;cos(2(#Psi_{2}^{A}-#Psi_{2}^{B}));#it{q}_{2}", {HistType::kTH3F, {{100, 0, 100}, {cosAxis}, {eseAxis}}}); + registry.addClone("hCosPsi2AmC", "hCosPsi2AmB"); + registry.addClone("hCosPsi2AmC", "hCosPsi2BmC"); + registry.add("hQvecUncorV2", ";Centrality;Q_x;Q_y", {HistType::kTH3F, {{100, 0, 100}, {qvecAxis}, {qvecAxis}}}); + registry.addClone("hQvecUncorV2", "hQvecRectrV2"); + registry.addClone("hQvecUncorV2", "hQvecTwistV2"); + registry.addClone("hQvecUncorV2", "hQvecFinalV2"); + registry.addClone("hPsi2FT0C", "hEPUncorV2"); + registry.addClone("hPsi2FT0C", "hEPRectrV2"); + registry.addClone("hPsi2FT0C", "hEPTwistV2"); + } + if (doprocessMCParticleLevel) { + LOGF(info, "JetSpectraEseTask::init() - processMCParticleLevel"); + registry.add("hMCPartEventCounter", "event status;event status;entries", {HistType::kTH1F, {{10, 0.0, 10.0}}}); + registry.add("hPartJetPt", "particle level jet pT;#it{p}_{T,jet part} (GeV/#it{c});entries", {HistType::kTH1F, {{jetPtAxis}}}); + registry.add("hPartJetPtSubBkg", "particle level jet pT;#it{p}_{T,jet part} (GeV/#it{c});entries", {HistType::kTH1F, {{jetPtAxis}}}); + registry.add("hPartJetEta", "particle level jet #eta;#eta_{jet part};entries", {HistType::kTH1F, {{100, -1.0, 1.0}}}); + registry.add("hPartJetPhi", "particle level jet #phi;#phi_{jet part};entries", {HistType::kTH1F, {{80, -1.0, 7.}}}); + } + if (doprocessMCDetectorLevel) { + LOGF(info, "JetSpectraEseTask::init() - processMCDetectorLevel"); + registry.add("hMCDetEventCounter", "event status;event status;entries", {HistType::kTH1F, {{10, 0.0, 10.0}}}); + registry.add("hDetJetPt", "particle level jet pT;#it{p}_{T,jet part} (GeV/#it{c});entries", {HistType::kTH1F, {{jetPtAxis}}}); + registry.add("hDetJetPtSubBkg", "particle level jet pT;#it{p}_{T,jet part} (GeV/#it{c});entries", {HistType::kTH1F, {{jetPtAxis}}}); + registry.add("hDetJetEta", "particle level jet #eta;#eta_{jet part};entries", {HistType::kTH1F, {{100, -1.0, 1.0}}}); + registry.add("hDetJetPhi", "particle level jet #phi;#phi_{jet part};entries", {HistType::kTH1F, {{80, -1.0, 7.}}}); + } + if (doprocessMCChargedMatched) { + LOGF(info, "JetSpectraEseTask::init() - processMCChargedMatched"); + registry.add("hMCEventCounter", "event status;event status;entries", {HistType::kTH1F, {{10, 0.0, 10.0}}}); + registry.add("hMCDMatchedEventCounter", "event status;event status;entries", {HistType::kTH1F, {{10, 0.0, 10.0}}}); + registry.add("hCentralityMult", ";Centrality;entries", {HistType::kTH1F, {{100, 0, 100}}}); + registry.add("hPartJetPtMatch", ";Centrality;#it{p}_{T,jet part} (GeV/#it{c})", {HistType::kTH2F, {{100, 0, 100}, {jetPtAxis}}}); + registry.add("hPartJetPtMatchSubBkg", ";Centrality;#it{p}_{T,jet part} (GeV/#it{c})", {HistType::kTH2F, {{100, 0, 100},{jetPtAxis}}}); + registry.add("hPartJetEtaMatch", "particle level jet #eta;#eta_{jet part};entries", {HistType::kTH1F, {{100, -1.0, 1.0}}}); + registry.add("hPartJetPhiMatch", "particle level jet #phi;#phi_{jet part};entries", {HistType::kTH1F, {{80, -1.0, 7.}}}); + registry.add("hDetectorJetPt", ";Centrality;#it{p}_{T,jet det} (GeV/#it{c})", {HistType::kTH2F, {{100, 0, 100}, {jetPtAxis}}}); + registry.add("hDetectorJetPtSubBkg", ";Centrality;#it{p}_{T,jet det} (GeV/#it{c})", {HistType::kTH2F, {{100, 0, 100}, {jetPtAxis}}}); + registry.add("hDetectorJetEta", "detector level jet #eta;#eta_{jet det};entries", {HistType::kTH1F, {{100, -1.0, 1.0}}}); + registry.add("hDetectorJetPhi", "detector level jet #phi;#phi_{jet det};entries", {HistType::kTH1F, {{80, -1.0, 7.}}}); + registry.add("hMatchedJetsPtDelta", "#it{p}_{T,jet part}; det - part", {HistType::kTH2F, {{jetPtAxis}, {200, -20., 20.0}}}); + registry.add("hGenMatchedJetsPtDeltadPt", "#it{p}_{T,jet part}; det - part / part", {HistType::kTHnSparseF, {{100, 0, 100}, {jetPtAxis}, {200, -20., 20.0}}}); + registry.add("hRecoMatchedJetsPtDeltadPt", "#it{p}_{T,jet det}; det - part / det", {HistType::kTHnSparseF, {{100, 0, 100}, {jetPtAxis}, {200, -20., 20.0}}}); + registry.add("hMatchedJetsEtaDelta", "#eta_{jet part}; det - part", {HistType::kTH2F, {{100, -1.0, 1.0}, {200, -0.8, 0.8}}}); + registry.add("hMatchedJetsPhiDelta", "#phi_{jet part}; det - part", {HistType::kTH2F, {{80, -1.0, 7.}, {200, -10.0, 10.}}}); + registry.add("hRespMcDMcPMatch", ";Centrality,#it{p}_{T, jet det}; #it{p}_{T, jet part}", HistType::kTHnSparseF, {{100, 0, 100}, jetPtAxis, jetPtAxis}); + registry.add("hRespMcDMcPMatchSubBkg", ";Centrality,#it{p}_{T, jet det}; #it{p}_{T, jet part}", HistType::kTHnSparseF, {{100, 0, 100}, jetPtAxis, jetPtAxis}); + } + if (doprocessESEOccupancy) { + LOGF(info, "JetSpectraEseTask::init() - processESEOccupancy"); + registry.add("hEventCounterOcc", "event status;event status;entries", {HistType::kTH1F, {{10, 0.0, 10.0}}}); + registry.add("hTrackPt", "track pT;#it{p}_{T,track} (GeV/#it{c});entries", {HistType::kTHnSparseF, {{100, 0, 100}, {100, 0, 100}, {eseAxis}, {occAxis}}}); + registry.add("hTrackEta", "track #eta;#eta_{track};entries", {HistType::kTH3F, {{100, 0, 100}, {100, -1.0, 1.0}, {occAxis}}}); + registry.add("hTrackPhi", "track #phi;#phi_{track};entries", {HistType::kTH3F, {{100, 0, 100}, {80, -1.0, 7.}, {occAxis}}}); + registry.add("hOccupancy", "Occupancy;Occupancy;entries", {HistType::kTH1F, {{occAxis}}}); + registry.add("hPsiOccupancy", "Occupancy;#Psi_{2};entries", {HistType::kTH3F, {{100, 0, 100}, {150, -2.5, 2.5}, {occAxis}}}); } } + Filter jetCuts = aod::jet::pt > jetPtMin&& aod::jet::r == nround(jetR.node() * 100.0f) && nabs(aod::jet::eta) < 0.9f - jetR; Filter colFilter = nabs(aod::jcollision::posZ) < vertexZCut; @@ -254,29 +257,54 @@ struct JetSpectraEseTask { } PROCESS_SWITCH(JetSpectraEseTask, processESEOccupancy, "process occupancy", false); - void processMCParticleLevel(soa::Join::iterator const& col, + void processMCParticleLevel(soa::Join::iterator const& collision, soa::Filtered const& jets) { float counter{0.5f}; - registry.fill(HIST("hMCPureEventCounter"), counter++); - if (col.size() < 1) { + registry.fill(HIST("hMCPartEventCounter"), counter++); + if (collision.size() < 1) { return; } - registry.fill(HIST("hMCPureEventCounter"), counter++); - if (!(std::abs(col.posZ()) < vertexZCut)) { + registry.fill(HIST("hMCPartEventCounter"), counter++); + if (!(std::abs(collision.posZ()) < vertexZCut)) { return; } - registry.fill(HIST("hMCPureEventCounter"), counter++); + registry.fill(HIST("hMCPartEventCounter"), counter++); for (const auto& jet : jets) { registry.fill(HIST("hPartJetPt"), jet.pt()); - registry.fill(HIST("hPartJetPtSubBkg"), jet.pt() - (col.rho() * jet.area())); + registry.fill(HIST("hPartJetPtSubBkg"), jet.pt() - (collision.rho() * jet.area())); registry.fill(HIST("hPartJetEta"), jet.eta()); registry.fill(HIST("hPartJetPhi"), jet.phi()); } } PROCESS_SWITCH(JetSpectraEseTask, processMCParticleLevel, "jets on particle level MC", false); + void processMCDetectorLevel(soa::Join::iterator const& collision, + ChargedMCDJets const& mcdjets, + aod::JetTracks const&, + aod::JetParticles const&) + { + float counter{0.5f}; + if (!jetderiveddatautilities::selectCollision(collision, eventSelection)) + return; + registry.fill(HIST("hMCDetEventCounter"), counter++); + + if (cfgEvSelOccupancy && !isOccupancyWithin(collision)) + return; + registry.fill(HIST("hMCDetEventCounter"), counter++); + + for (const auto& mcdjet : mcdjets) { + auto mcdetPt{mcdjet.pt() - (collision.rho() * mcdjet.area())}; + registry.fill(HIST("hDetJetPt"), mcdjet.pt()); + registry.fill(HIST("hDetJetPtSubBkg"), mcdetPt); + registry.fill(HIST("hDetJetEta"), mcdjet.eta()); + registry.fill(HIST("hDetJetPhi"), mcdjet.phi()); + } + + } + PROCESS_SWITCH(JetSpectraEseTask, processMCDetectorLevel, "jets on detector level", false); + using JetMCPTable = soa::Filtered>; void processMCChargedMatched(/*soa::Filtered::iterator const& collision*/ soa::Join::iterator const& mcCol, @@ -304,10 +332,6 @@ struct JetSpectraEseTask { return; } - if (collision.centrality() < centRange->at(0) || collision.centrality() > centRange->at(1)) - return; - registry.fill(HIST("hMCDMatchedEventCounter"), secCount++); - if (!jetderiveddatautilities::selectCollision(collision, eventSelection)) return; registry.fill(HIST("hMCDMatchedEventCounter"), secCount++); @@ -316,21 +340,24 @@ struct JetSpectraEseTask { return; registry.fill(HIST("hMCDMatchedEventCounter"), secCount++); + if (collision.centrality() < centRange->at(0) || collision.centrality() > centRange->at(1)) + registry.fill(HIST("hMCDMatchedEventCounter"), secCount++); + registry.fill(HIST("hCentralityMult"), collision.centrality()); auto collmcdJets{mcdjets.sliceBy(mcdjetsPerJCollision, collision.globalIndex())}; for (const auto& mcdjet : collmcdJets) { auto mcdPt{mcdjet.pt() - (collision.rho() * mcdjet.area())}; - registry.fill(HIST("hDetectorJetPt"), mcdjet.pt()); - registry.fill(HIST("hDetectorJetPtSubBkg"), mcdPt); + registry.fill(HIST("hDetectorJetPt"), collision.centrality(), mcdjet.pt()); + registry.fill(HIST("hDetectorJetPtSubBkg"), collision.centrality(), mcdPt); registry.fill(HIST("hDetectorJetEta"), mcdjet.eta()); registry.fill(HIST("hDetectorJetPhi"), mcdjet.phi()); for (const auto& mcpjet : mcdjet.template matchedJetGeo_as()) { auto mcpPt{mcpjet.pt() - (mcCol.rho() * mcpjet.area())}; - registry.fill(HIST("hPartJetPtMatch"), mcpjet.pt()); - registry.fill(HIST("hPartJetPtMatchSubBkg"), mcpPt); + registry.fill(HIST("hPartJetPtMatch"), collision.centrality(), mcpjet.pt()); + registry.fill(HIST("hPartJetPtMatchSubBkg"), collision.centrality(), mcpPt); registry.fill(HIST("hPartJetEtaMatch"), mcpjet.eta()); registry.fill(HIST("hPartJetPhiMatch"), mcpjet.phi()); - registry.fill(HIST("hMatchedJetsPtDelta"), mcpPt, mcdPt - mcpPt); + registry.fill(HIST("hMatchedJetsPtDelta"), mcpjet.pt(), mcdjet.pt() - mcpjet.pt()); registry.fill(HIST("hGenMatchedJetsPtDeltadPt"), collision.centrality(), mcpPt, (mcdPt - mcpPt) / mcpPt); registry.fill(HIST("hRecoMatchedJetsPtDeltadPt"), collision.centrality(), mcdPt, (mcdPt - mcpPt) / mcdPt); registry.fill(HIST("hMatchedJetsPhiDelta"), mcpjet.phi(), mcdjet.phi() - mcpjet.phi()); @@ -344,7 +371,7 @@ struct JetSpectraEseTask { } registry.fill(HIST("hMCEventCounter"), counter++); } - PROCESS_SWITCH(JetSpectraEseTask, processMCChargedMatched, "jet geto matched mcp and mcd", false); + PROCESS_SWITCH(JetSpectraEseTask, processMCChargedMatched, "jet MC process: geometrically matched MCP and MCD for response matrix and efficiency", false); template bool isAcceptedLeadTrack(T const& tracks) From 02627a187d41c889d6c4535a99a947774d3d879d Mon Sep 17 00:00:00 2001 From: joachimckh Date: Wed, 29 Jan 2025 13:11:45 +0100 Subject: [PATCH 2/2] clang-format --- PWGJE/Tasks/jetSpectraEseTask.cxx | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/PWGJE/Tasks/jetSpectraEseTask.cxx b/PWGJE/Tasks/jetSpectraEseTask.cxx index 88f06c19cb2..f6ea1fe4018 100644 --- a/PWGJE/Tasks/jetSpectraEseTask.cxx +++ b/PWGJE/Tasks/jetSpectraEseTask.cxx @@ -129,7 +129,7 @@ struct JetSpectraEseTask { registry.addClone("hPsi2FT0C", "hEPRectrV2"); registry.addClone("hPsi2FT0C", "hEPTwistV2"); } - if (doprocessMCParticleLevel) { + if (doprocessMCParticleLevel) { LOGF(info, "JetSpectraEseTask::init() - processMCParticleLevel"); registry.add("hMCPartEventCounter", "event status;event status;entries", {HistType::kTH1F, {{10, 0.0, 10.0}}}); registry.add("hPartJetPt", "particle level jet pT;#it{p}_{T,jet part} (GeV/#it{c});entries", {HistType::kTH1F, {{jetPtAxis}}}); @@ -151,7 +151,7 @@ struct JetSpectraEseTask { registry.add("hMCDMatchedEventCounter", "event status;event status;entries", {HistType::kTH1F, {{10, 0.0, 10.0}}}); registry.add("hCentralityMult", ";Centrality;entries", {HistType::kTH1F, {{100, 0, 100}}}); registry.add("hPartJetPtMatch", ";Centrality;#it{p}_{T,jet part} (GeV/#it{c})", {HistType::kTH2F, {{100, 0, 100}, {jetPtAxis}}}); - registry.add("hPartJetPtMatchSubBkg", ";Centrality;#it{p}_{T,jet part} (GeV/#it{c})", {HistType::kTH2F, {{100, 0, 100},{jetPtAxis}}}); + registry.add("hPartJetPtMatchSubBkg", ";Centrality;#it{p}_{T,jet part} (GeV/#it{c})", {HistType::kTH2F, {{100, 0, 100}, {jetPtAxis}}}); registry.add("hPartJetEtaMatch", "particle level jet #eta;#eta_{jet part};entries", {HistType::kTH1F, {{100, -1.0, 1.0}}}); registry.add("hPartJetPhiMatch", "particle level jet #phi;#phi_{jet part};entries", {HistType::kTH1F, {{80, -1.0, 7.}}}); registry.add("hDetectorJetPt", ";Centrality;#it{p}_{T,jet det} (GeV/#it{c})", {HistType::kTH2F, {{100, 0, 100}, {jetPtAxis}}}); @@ -176,7 +176,6 @@ struct JetSpectraEseTask { registry.add("hPsiOccupancy", "Occupancy;#Psi_{2};entries", {HistType::kTH3F, {{100, 0, 100}, {150, -2.5, 2.5}, {occAxis}}}); } } - Filter jetCuts = aod::jet::pt > jetPtMin&& aod::jet::r == nround(jetR.node() * 100.0f) && nabs(aod::jet::eta) < 0.9f - jetR; Filter colFilter = nabs(aod::jcollision::posZ) < vertexZCut; @@ -281,13 +280,13 @@ struct JetSpectraEseTask { PROCESS_SWITCH(JetSpectraEseTask, processMCParticleLevel, "jets on particle level MC", false); void processMCDetectorLevel(soa::Join::iterator const& collision, - ChargedMCDJets const& mcdjets, - aod::JetTracks const&, - aod::JetParticles const&) + ChargedMCDJets const& mcdjets, + aod::JetTracks const&, + aod::JetParticles const&) { float counter{0.5f}; if (!jetderiveddatautilities::selectCollision(collision, eventSelection)) - return; + return; registry.fill(HIST("hMCDetEventCounter"), counter++); if (cfgEvSelOccupancy && !isOccupancyWithin(collision)) @@ -301,7 +300,6 @@ struct JetSpectraEseTask { registry.fill(HIST("hDetJetEta"), mcdjet.eta()); registry.fill(HIST("hDetJetPhi"), mcdjet.phi()); } - } PROCESS_SWITCH(JetSpectraEseTask, processMCDetectorLevel, "jets on detector level", false);