From 7f40cdb2cb86ad39fe70fb9c2745d70b48111c51 Mon Sep 17 00:00:00 2001 From: Changhwan Choi Date: Wed, 5 Nov 2025 22:32:11 +0900 Subject: [PATCH 1/2] Removed jet event weight task dependencies --- PWGJE/Tasks/bjetTreeCreator.cxx | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/PWGJE/Tasks/bjetTreeCreator.cxx b/PWGJE/Tasks/bjetTreeCreator.cxx index 4185a404273..e38128e4324 100644 --- a/PWGJE/Tasks/bjetTreeCreator.cxx +++ b/PWGJE/Tasks/bjetTreeCreator.cxx @@ -82,7 +82,7 @@ DECLARE_SOA_TABLE(bjetParams, "AOD", "BJETPARAM", using bjetParam = bjetParams::iterator; -DECLARE_SOA_TABLE(bjetParamsExtra, "AOD", "BJETEXTRA", +DECLARE_SOA_TABLE(bjetParamsExtra, "AOD", "BJETPARAMSEXTRA", // o2::soa::Index<>, jetInfo::JetEventWeight); @@ -556,7 +556,7 @@ struct BJetTreeCreator { if (produceTree) { bjetTracksParamsTable(bjetParamsTable.lastIndex() + 1, constituent.pt(), constituent.eta(), dotProduct, dotProduct / analysisJet.p(), deltaRJetTrack, std::abs(constituent.dcaXY()) * sign, constituent.sigmadcaXY(), std::abs(constituent.dcaZ()) * sign, constituent.sigmadcaZ(), constituent.sigmadcaXYZ(), constituent.p() / analysisJet.p(), 0.); - } + }if(std::fabs(constituent.dcaZ())>2.f)LOGF(info, "Track DCAz: %f", constituent.dcaZ()); trackIndices.push_back(bjetTracksParamsTable.lastIndex()); } } @@ -613,8 +613,8 @@ struct BJetTreeCreator { } PROCESS_SWITCH(BJetTreeCreator, processDataJets, "jet information in Data", false); - using MCDJetTable = soa::Filtered>; - using MCPJetTable = soa::Filtered>; + using MCDJetTable = soa::Filtered>; + using MCPJetTable = soa::Filtered>; using FilteredCollisionMCD = soa::Filtered>; Preslice mcParticlesPerCollision = aod::jmcparticle::mcCollisionId; @@ -626,6 +626,8 @@ struct BJetTreeCreator { return; } + float eventWeight = collision.weight(); + registry.fill(HIST("h_vertexZ"), collision.posZ()); auto const mcParticlesPerColl = MCParticles.sliceBy(mcParticlesPerCollision, collision.mcCollisionId()); @@ -645,7 +647,6 @@ struct BJetTreeCreator { continue; } - float eventWeight = analysisJet.eventWeight(); float pTHat = 10. / (std::pow(eventWeight, 1.0 / pTHatExponent)); if (analysisJet.pt() > pTHatMaxMCD * pTHat) { continue; @@ -712,13 +713,13 @@ struct BJetTreeCreator { if (produceTree) { bjetConstituentsTable(bjetParamsTable.lastIndex() + 1, indicesTracks, indicesSVs); bjetParamsTable(analysisJet.pt(), analysisJet.eta(), analysisJet.phi(), indicesTracks.size(), nSVs, analysisJet.mass(), jetFlavor, analysisJet.r()); - bjetParamsExtraTable(analysisJet.eventWeight()); + bjetParamsExtraTable(eventWeight); } } } PROCESS_SWITCH(BJetTreeCreator, processMCJets, "jet information in MC", false); - using MCDJetTableNoSV = soa::Filtered>; + using MCDJetTableNoSV = soa::Filtered>; using JetParticleswID = soa::Join; void processMCJetsForGNN(FilteredCollisionMCD::iterator const& collision, aod::JMcCollisions const&, MCDJetTableNoSV const& MCDjets, MCPJetTable const& MCPjets, JetTracksMCDwID const& allTracks, JetParticleswID const& MCParticles, OriginalTracks const& origTracks, aod::McParticles const& origParticles) @@ -732,7 +733,9 @@ struct BJetTreeCreator { return; } - registry.fill(HIST("h_vertexZ"), collision.posZ(), collision.weight()); + float eventWeight = collision.weight(); + + registry.fill(HIST("h_vertexZ"), collision.posZ(), eventWeight); auto const mcParticlesPerColl = MCParticles.sliceBy(mcParticlesPerCollision, collision.mcCollisionId()); auto const mcPJetsPerColl = MCPjets.sliceBy(mcpJetsPerCollision, collision.mcCollisionId()); @@ -760,8 +763,6 @@ struct BJetTreeCreator { continue; } - float eventWeight = analysisJet.eventWeight(); - //+ TrackLabelMap trkLabels{{"trkVtxIndex", {}}, {"trkOrigin", {}}}; int nVertices = jettaggingutilities::vertexClustering(collision.template mcCollision_as(), analysisJet, allTracks, MCParticles, origParticles, trkLabels, true, vtxRes, trackPtMin); @@ -801,8 +802,9 @@ struct BJetTreeCreator { Filter mccollisionFilter = nabs(aod::jmccollision::posZ) < vertexZCut; using FilteredCollisionMCP = soa::Filtered; - void processMCTruthJets(FilteredCollisionMCP::iterator const& /*collision*/, MCPJetTable const& MCPjets, aod::JetParticles const& MCParticles) + void processMCTruthJets(FilteredCollisionMCP::iterator const& collision, MCPJetTable const& MCPjets, aod::JetParticles const& MCParticles) { + float eventWeight = collision.weight(); for (const auto& mcpjet : MCPjets) { @@ -818,7 +820,6 @@ struct BJetTreeCreator { continue; } - float eventWeight = mcpjet.eventWeight(); float pTHat = 10. / (std::pow(eventWeight, 1.0 / pTHatExponent)); if (mcpjet.pt() > pTHatMaxMCP * pTHat) { continue; From 2016156b221ccc1320196238834b03caa202d5a4 Mon Sep 17 00:00:00 2001 From: choich08365 <157435123+choich08365@users.noreply.github.com> Date: Wed, 5 Nov 2025 22:39:41 +0900 Subject: [PATCH 2/2] Removed unnecessary LOGF --- PWGJE/Tasks/bjetTreeCreator.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PWGJE/Tasks/bjetTreeCreator.cxx b/PWGJE/Tasks/bjetTreeCreator.cxx index e38128e4324..c42453f6817 100644 --- a/PWGJE/Tasks/bjetTreeCreator.cxx +++ b/PWGJE/Tasks/bjetTreeCreator.cxx @@ -556,7 +556,7 @@ struct BJetTreeCreator { if (produceTree) { bjetTracksParamsTable(bjetParamsTable.lastIndex() + 1, constituent.pt(), constituent.eta(), dotProduct, dotProduct / analysisJet.p(), deltaRJetTrack, std::abs(constituent.dcaXY()) * sign, constituent.sigmadcaXY(), std::abs(constituent.dcaZ()) * sign, constituent.sigmadcaZ(), constituent.sigmadcaXYZ(), constituent.p() / analysisJet.p(), 0.); - }if(std::fabs(constituent.dcaZ())>2.f)LOGF(info, "Track DCAz: %f", constituent.dcaZ()); + } trackIndices.push_back(bjetTracksParamsTable.lastIndex()); } }