From 409e47ae1f85b52edd0388bc7181c7e5a85ca02d Mon Sep 17 00:00:00 2001 From: HANSEO PARK Date: Thu, 22 Jan 2026 11:30:16 +0900 Subject: [PATCH 1/4] Being developing mult of b-jet Add bjet multiplcity analysis fix CMakeList fix to complict rebase modificaiton validation of flavour and seconday contamition fix CMakeList --- .../TableProducer/secondaryVertexReconstruction.cxx | 12 ++++++------ PWGJE/Tasks/CMakeLists.txt | 2 ++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/PWGJE/TableProducer/secondaryVertexReconstruction.cxx b/PWGJE/TableProducer/secondaryVertexReconstruction.cxx index c1ee4dd3b73..39e2c7c722c 100644 --- a/PWGJE/TableProducer/secondaryVertexReconstruction.cxx +++ b/PWGJE/TableProducer/secondaryVertexReconstruction.cxx @@ -22,22 +22,22 @@ #include "Common/Core/trackUtilities.h" #include "Common/DataModel/TrackSelectionTables.h" +#include "CommonConstants/PhysicsConstants.h" +#include "DCAFitter/DCAFitterN.h" +#include "Framework/ASoA.h" +#include "Framework/AnalysisDataModel.h" +#include "Framework/AnalysisTask.h" +#include "ReconstructionDataFormats/DCA.h" #include -#include -#include #include #include -#include -#include #include -#include #include #include #include #include #include #include -#include #include #include diff --git a/PWGJE/Tasks/CMakeLists.txt b/PWGJE/Tasks/CMakeLists.txt index a1b103a528c..1dd0abad6bd 100644 --- a/PWGJE/Tasks/CMakeLists.txt +++ b/PWGJE/Tasks/CMakeLists.txt @@ -397,6 +397,8 @@ if(FastJet_FOUND) COMPONENT_NAME Analysis) o2physics_add_dpl_workflow(jet-ds-spec-subs SOURCES jetDsSpecSubs.cxx + o2physics_add_dpl_workflow(jet-ds-spectrum-subs + SOURCES jetDsSpectrumAndSubstructure.cxx PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore COMPONENT_NAME Analysis) o2physics_add_dpl_workflow(jet-d0-ang-substructure From 2c8e8754e7ffaf5ce65812824e188a126a303b6a Mon Sep 17 00:00:00 2001 From: HANSEO PARK Date: Fri, 1 May 2026 00:37:36 +0900 Subject: [PATCH 2/4] modification of 3 prong to n-prong issue of rebase fix issue of rebase 2 fix issue of rebase 3 to change the name --- .../TableProducer/secondaryVertexReconstruction.cxx | 12 ++++++------ PWGJE/Tasks/CMakeLists.txt | 2 -- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/PWGJE/TableProducer/secondaryVertexReconstruction.cxx b/PWGJE/TableProducer/secondaryVertexReconstruction.cxx index 39e2c7c722c..c1ee4dd3b73 100644 --- a/PWGJE/TableProducer/secondaryVertexReconstruction.cxx +++ b/PWGJE/TableProducer/secondaryVertexReconstruction.cxx @@ -22,22 +22,22 @@ #include "Common/Core/trackUtilities.h" #include "Common/DataModel/TrackSelectionTables.h" -#include "CommonConstants/PhysicsConstants.h" -#include "DCAFitter/DCAFitterN.h" -#include "Framework/ASoA.h" -#include "Framework/AnalysisDataModel.h" -#include "Framework/AnalysisTask.h" -#include "ReconstructionDataFormats/DCA.h" #include +#include +#include #include #include +#include +#include #include +#include #include #include #include #include #include #include +#include #include #include diff --git a/PWGJE/Tasks/CMakeLists.txt b/PWGJE/Tasks/CMakeLists.txt index 1dd0abad6bd..a1b103a528c 100644 --- a/PWGJE/Tasks/CMakeLists.txt +++ b/PWGJE/Tasks/CMakeLists.txt @@ -397,8 +397,6 @@ if(FastJet_FOUND) COMPONENT_NAME Analysis) o2physics_add_dpl_workflow(jet-ds-spec-subs SOURCES jetDsSpecSubs.cxx - o2physics_add_dpl_workflow(jet-ds-spectrum-subs - SOURCES jetDsSpectrumAndSubstructure.cxx PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore COMPONENT_NAME Analysis) o2physics_add_dpl_workflow(jet-d0-ang-substructure From 7b197b327be244328da8a055246597dceb904603 Mon Sep 17 00:00:00 2001 From: HANSEO PARK Date: Fri, 8 May 2026 17:41:53 +0900 Subject: [PATCH 3/4] small fix --- PWGJE/Tasks/bjetCentMult.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PWGJE/Tasks/bjetCentMult.cxx b/PWGJE/Tasks/bjetCentMult.cxx index fa0beb6081d..545fd434db0 100644 --- a/PWGJE/Tasks/bjetCentMult.cxx +++ b/PWGJE/Tasks/bjetCentMult.cxx @@ -144,7 +144,7 @@ struct BjetCentMultTask { registry.add("h2_centrality_percentile_multiplicity", "mcd collision centrality; centrality; counts", {HistType::kTH2F, {{axisRebinnedCentrality}, {axisPercentileMultiplicity}}}); } if (doprocessSVData) { - registry.add("h_event_rhoareasubtracted_centrality", "", {HistType::kTH1F, {{axisCentrality}}}); + registry.add("h_event_centrality", "", {HistType::kTH1F, {{axisCentrality}}}); registry.add("h2_jet_pt_centrality", "", {HistType::kTH2F, {{axisJetPt}, {axisCentrality}}}); registry.add("h2_jet_eta_centrality", "", {HistType::kTH2F, {{axisEta}, {axisCentrality}}}); registry.add("h2_jet_phi_centrality", "", {HistType::kTH2F, {{axisPhi}, {axisCentrality}}}); @@ -163,7 +163,7 @@ struct BjetCentMultTask { } } if (doprocessRhoAreaSubSVData) { - registry.add("h_event_centrality", "", {HistType::kTH1F, {{axisCentrality}}}); + registry.add("h_event_rhoareasubtracted_centrality", "", {HistType::kTH1F, {{axisCentrality}}}); registry.add("h2_jet_pt_rhoareasubtracted_centrality", "", {HistType::kTH2F, {{axisJetPt}, {axisCentrality}}}); registry.add("h2_jet_eta_rhoareasubtracted_centrality", "", {HistType::kTH2F, {{axisEta}, {axisCentrality}}}); registry.add("h2_jet_phi_rhoareasubtracted_centrality", "", {HistType::kTH2F, {{axisPhi}, {axisCentrality}}}); From 7523ee1af3598633d67a86e143c82a8d0c07ff49 Mon Sep 17 00:00:00 2001 From: HANSEO PARK Date: Fri, 8 May 2026 17:42:59 +0900 Subject: [PATCH 4/4] small fix 2 --- PWGJE/TableProducer/secondaryVertexReconstruction.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PWGJE/TableProducer/secondaryVertexReconstruction.cxx b/PWGJE/TableProducer/secondaryVertexReconstruction.cxx index c1ee4dd3b73..d722cb4d743 100644 --- a/PWGJE/TableProducer/secondaryVertexReconstruction.cxx +++ b/PWGJE/TableProducer/secondaryVertexReconstruction.cxx @@ -283,7 +283,7 @@ struct SecondaryVertexReconstruction { zMomenta, energySV, massSV, chi2PCA, dispersion, errorDecayLength, errorDecayLengthXY); svIndices.push_back(sv2prongTableData.lastIndex()); - } else if ((doprocessDataNProngs || doprocessDataNProngsExternalMagneticField) && numProngs == TwoProngCount) { + } else if ((doprocessDataNProngs || doprocessDataNProngsExternalMagneticField)) { svnprongTableData(analysisJet.globalIndex(), primaryVertex.getX(), primaryVertex.getY(), primaryVertex.getZ(), secondaryVertex[0], secondaryVertex[1], secondaryVertex[2],