Skip to content

PWGJE: Adding radius dependence to substrucuture task #3081

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nzardosh merged 1 commit into from
Jul 16, 2023
Merged

PWGJE: Adding radius dependence to substrucuture task #3081

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions PWGJE/DataModel/JetSubstructure.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,20 +42,21 @@ DECLARE_SOA_INDEX_COLUMN(McCollision, mcCollision); //!
DECLARE_SOA_COLUMN(JetPt, jetPt, float); //!
DECLARE_SOA_COLUMN(JetPhi, jetPhi, float); //!
DECLARE_SOA_COLUMN(JetEta, jetEta, float); //!
DECLARE_SOA_COLUMN(JetR, jetR, float); //!
DECLARE_SOA_COLUMN(JetNConstituents, jetNConstituents, int); //!

} // namespace jetoutput

// Defines the jet substrcuture table definition
#define JETSUBSTRUCTURE_TABLE_DEF(_collision_type_, _jet_type_, _cand_type_, _name_, _description_) \
namespace _name_##substructure \
{ \
DECLARE_SOA_INDEX_COLUMN(_jet_type_, jet); \
DECLARE_SOA_INDEX_COLUMN_FULL(Candidate, candidate, int, _cand_type_, "_0"); \
DECLARE_SOA_DYNAMIC_COLUMN(Dummy##_jet_type_, dummy##_jet_type_, []() -> int { return 0; }); \
} \
DECLARE_SOA_TABLE(_jet_type_##Substructures, "AOD", _description_ "SS", jetsubstructure::Zg, jetsubstructure::Rg, jetsubstructure::Nsd, _name_##substructure::Dummy##_jet_type_<>); \
DECLARE_SOA_TABLE(_jet_type_##Output, "AOD", _description_ "O", jetoutput::_collision_type_##Id, _name_##substructure::_jet_type_##Id, _name_##substructure::Candidate##Id, jetoutput::JetPt, jetoutput::JetPhi, jetoutput::JetEta, jetoutput::JetNConstituents); \
#define JETSUBSTRUCTURE_TABLE_DEF(_collision_type_, _jet_type_, _cand_type_, _name_, _description_) \
namespace _name_##substructure \
{ \
DECLARE_SOA_INDEX_COLUMN(_jet_type_, jet); \
DECLARE_SOA_INDEX_COLUMN_FULL(Candidate, candidate, int, _cand_type_, "_0"); \
DECLARE_SOA_DYNAMIC_COLUMN(Dummy##_jet_type_, dummy##_jet_type_, []() -> int { return 0; }); \
} \
DECLARE_SOA_TABLE(_jet_type_##Substructures, "AOD", _description_ "SS", jetsubstructure::Zg, jetsubstructure::Rg, jetsubstructure::Nsd, _name_##substructure::Dummy##_jet_type_<>); \
DECLARE_SOA_TABLE(_jet_type_##Output, "AOD", _description_ "O", jetoutput::_collision_type_##Id, _name_##substructure::_jet_type_##Id, _name_##substructure::Candidate##Id, jetoutput::JetPt, jetoutput::JetPhi, jetoutput::JetEta, jetoutput::JetR, jetoutput::JetNConstituents); \
DECLARE_SOA_TABLE(_jet_type_##SubstructureOutput, "AOD", _description_ "SSO", _name_##substructure::_jet_type_##Id, jetsubstructure::Zg, jetsubstructure::Rg, jetsubstructure::Nsd);

#define JETSUBSTRUCTURE_TABLES_DEF(_jet_type_, _cand_type_, _description_) \
Expand Down
13 changes: 5 additions & 8 deletions PWGJE/Tasks/jetsubstructure.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,8 @@ struct JetSubstructureTask {
OutputObj<TH2F> hRg{"h_jet_rg_jet_pt"};
OutputObj<TH2F> hNsd{"h_jet_nsd_jet_pt"};

Configurable<float> jetPtMin{"jetPtMin", 0.0, "minimum jet pT cut"};
Configurable<float> zCut{"zCut", 0.1, "soft drop z cut"};
Configurable<float> beta{"beta", 0.0, "soft drop beta"};
Configurable<float> jetR{"jetR", 0.4, "jet resolution parameter"};

std::vector<fastjet::PseudoJet> jetConstituents;
std::vector<fastjet::PseudoJet> jetReclustered;
Expand All @@ -64,12 +62,11 @@ struct JetSubstructureTask {
10, 0.0, 0.5, 200, 0.0, 200.0));
hNsd.setObject(new TH2F("h_jet_nsd_jet_pt", ";n_{SD}; #it{p}_{T,jet} (GeV/#it{c})",
7, -0.5, 6.5, 200, 0.0, 200.0));

jetReclusterer.isReclustering = true;
jetReclusterer.algorithm = fastjet::JetAlgorithm::cambridge_algorithm;
}

Filter jetSelection = o2::aod::jet::r == nround(jetR.node() * 100.0f) && aod::jet::pt >= jetPtMin;

template <typename T>
void jetReclustering(T const& jet)
{
Expand All @@ -89,7 +86,7 @@ struct JetSubstructureTask {
}
auto z = parentSubJet2.perp() / (parentSubJet1.perp() + parentSubJet2.perp());
auto theta = parentSubJet1.delta_R(parentSubJet2);
if (z >= zCut * TMath::Power(theta / jetR, beta)) {
if (z >= zCut * TMath::Power(theta / (jet.r() / 100.f), beta)) {
if (!softDropped) {
zg = z;
rg = theta;
Expand Down Expand Up @@ -132,9 +129,9 @@ struct JetSubstructureTask {
}
PROCESS_SWITCH(JetSubstructureTask, processChargedJetsMCP, "charged jet substructure on MC particle level", false);
};
using JetSubstructureDataLevel = JetSubstructureTask<soa::Filtered<soa::Join<aod::ChargedJets, aod::ChargedJetConstituents>>, soa::Filtered<soa::Join<aod::ChargedMCParticleLevelJets, aod::ChargedMCParticleLevelJetConstituents>>, o2::aod::ChargedJetSubstructures>;
using JetSubstructureMCDetectorLevel = JetSubstructureTask<soa::Filtered<soa::Join<aod::ChargedMCDetectorLevelJets, aod::ChargedMCDetectorLevelJetConstituents>>, soa::Filtered<soa::Join<aod::ChargedMCParticleLevelJets, aod::ChargedMCParticleLevelJetConstituents>>, o2::aod::ChargedMCDetectorLevelJetSubstructures>;
using JetSubstructureMCParticleLevel = JetSubstructureTask<soa::Filtered<soa::Join<aod::ChargedMCDetectorLevelJets, aod::ChargedMCDetectorLevelJetConstituents>>, soa::Filtered<soa::Join<aod::ChargedMCParticleLevelJets, aod::ChargedMCParticleLevelJetConstituents>>, o2::aod::ChargedMCParticleLevelJetSubstructures>;
using JetSubstructureDataLevel = JetSubstructureTask<soa::Join<aod::ChargedJets, aod::ChargedJetConstituents>, soa::Join<aod::ChargedMCParticleLevelJets, aod::ChargedMCParticleLevelJetConstituents>, o2::aod::ChargedJetSubstructures>;
using JetSubstructureMCDetectorLevel = JetSubstructureTask<soa::Join<aod::ChargedMCDetectorLevelJets, aod::ChargedMCDetectorLevelJetConstituents>, soa::Join<aod::ChargedMCParticleLevelJets, aod::ChargedMCParticleLevelJetConstituents>, o2::aod::ChargedMCDetectorLevelJetSubstructures>;
using JetSubstructureMCParticleLevel = JetSubstructureTask<soa::Join<aod::ChargedMCDetectorLevelJets, aod::ChargedMCDetectorLevelJetConstituents>, soa::Join<aod::ChargedMCParticleLevelJets, aod::ChargedMCParticleLevelJetConstituents>, o2::aod::ChargedMCParticleLevelJetSubstructures>;

WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
{
Expand Down
31 changes: 14 additions & 17 deletions PWGJE/Tasks/jetsubstructurehf.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,8 @@ struct JetSubstructureHFTask {
OutputObj<TH2F> hNsd{"h_jet_nsd_jet_pt"};

// Jet level configurables
Configurable<float> jetPtMin{"jetPtMin", 0.0, "minimum jet pT cut"};
Configurable<float> zCut{"zCut", 0.1, "soft drop z cut"};
Configurable<float> beta{"beta", 0.0, "soft drop beta"};
Configurable<float> jetR{"jetR", 0.4, "jet resolution parameter"};

Service<O2DatabasePDG> pdg;
int candPDG;
Expand All @@ -71,22 +69,21 @@ struct JetSubstructureHFTask {
10, 0.0, 0.5, 200, 0.0, 200.0));
hNsd.setObject(new TH2F("h_jet_nsd_jet_pt", ";n_{SD}; #it{p}_{T,jet} (GeV/#it{c})",
7, -0.5, 6.5, 200, 0.0, 200.0));

jetReclusterer.isReclustering = true;
jetReclusterer.algorithm = fastjet::JetAlgorithm::cambridge_algorithm;

if constexpr (std::is_same_v<std::decay_t<JetTableMCP>, soa::Filtered<soa::Join<aod::D0ChargedMCParticleLevelJets, aod::D0ChargedMCParticleLevelJetConstituents>>>) {
if constexpr (std::is_same_v<std::decay_t<JetTableMCP>, soa::Join<aod::D0ChargedMCParticleLevelJets, aod::D0ChargedMCParticleLevelJetConstituents>>) {
candPDG = static_cast<int>(pdg::Code::kD0);
}
if constexpr (std::is_same_v<std::decay_t<JetTableMCP>, soa::Filtered<soa::Join<aod::BplusChargedMCParticleLevelJets, aod::BplusChargedMCParticleLevelJetConstituents>>>) {
if constexpr (std::is_same_v<std::decay_t<JetTableMCP>, soa::Join<aod::BplusChargedMCParticleLevelJets, aod::BplusChargedMCParticleLevelJetConstituents>>) {
candPDG = static_cast<int>(pdg::Code::kBPlus);
}
if constexpr (std::is_same_v<std::decay_t<JetTableMCP>, soa::Filtered<soa::Join<aod::LcChargedMCParticleLevelJets, aod::LcChargedMCParticleLevelJetConstituents>>>) {
if constexpr (std::is_same_v<std::decay_t<JetTableMCP>, soa::Join<aod::LcChargedMCParticleLevelJets, aod::LcChargedMCParticleLevelJetConstituents>>) {
candPDG = static_cast<int>(pdg::Code::kLambdaCPlus);
}
}

Filter jetSelection = o2::aod::jet::r == nround(jetR.node() * 100.0f) && aod::jet::pt >= jetPtMin;

template <typename T>
void jetReclustering(T const& jet)
{
Expand All @@ -106,7 +103,7 @@ struct JetSubstructureHFTask {
}
auto z = parentSubJet2.perp() / (parentSubJet1.perp() + parentSubJet2.perp());
auto theta = parentSubJet1.delta_R(parentSubJet2);
if (z >= zCut * TMath::Power(theta / jetR, beta)) {
if (z >= zCut * TMath::Power(theta / (jet.r() / 100.f), beta)) {
if (!softDropped) {
zg = z;
rg = theta;
Expand Down Expand Up @@ -167,17 +164,17 @@ struct JetSubstructureHFTask {
}
PROCESS_SWITCH(JetSubstructureHFTask, processChargedJetsHFMCP, "HF jet substructure on MC particle level", false);
};
using JetSubstructureD0 = JetSubstructureHFTask<soa::Filtered<soa::Join<aod::D0ChargedJets, aod::D0ChargedJetConstituents>>, soa::Join<aod::HfCand2Prong, aod::HfSelD0>, soa::Filtered<soa::Join<aod::D0ChargedMCParticleLevelJets, aod::D0ChargedMCParticleLevelJetConstituents>>, o2::aod::D0ChargedJetSubstructures>;
// using MCDetectorLevelJetSubstructureD0 = JetSubstructureHFTask<soa::Filtered<soa::Join<aod::D0ChargedMCDetectorLevelJets, aod::D0ChargedMCDetectorLevelJetConstituents>>,soa::Join<aod::HfCand2Prong, aod::HfSelD0, aod::HfCand2ProngMcRec>,soa::Filtered<soa::Join<aod::D0ChargedMCParticleLevelJets, aod::D0ChargedMCParticleLevelJetConstituents>>,o2::aod::D0ChargedMCDetectorLevelJetSubstructures>;
// using MCParticleLevelJetSubstructureD0 = JetSubstructureHFTask<soa::Filtered<soa::Join<aod::D0ChargedMCDetectorLevelJets, aod::D0ChargedMCDetectorLevelJetConstituents>>,soa::Join<aod::HfCand2Prong, aod::HfSelD0, aod::HfCand2ProngMcRec>,soa::Filtered<soa::Join<aod::D0ChargedMCParticleLevelJets, aod::D0ChargedMCParticleLevelJetConstituents>>,o2::aod::D0ChargedMCParticleLevelJetSubstructures>;
using JetSubstructureD0 = JetSubstructureHFTask<soa::Join<aod::D0ChargedJets, aod::D0ChargedJetConstituents>, soa::Join<aod::HfCand2Prong, aod::HfSelD0>, soa::Join<aod::D0ChargedMCParticleLevelJets, aod::D0ChargedMCParticleLevelJetConstituents>, o2::aod::D0ChargedJetSubstructures>;
// using MCDetectorLevelJetSubstructureD0 = JetSubstructureHFTask<soa::Join<aod::D0ChargedMCDetectorLevelJets, aod::D0ChargedMCDetectorLevelJetConstituents>,soa::Join<aod::HfCand2Prong, aod::HfSelD0, aod::HfCand2ProngMcRec>,soa::Join<aod::D0ChargedMCParticleLevelJets, aod::D0ChargedMCParticleLevelJetConstituents>,o2::aod::D0ChargedMCDetectorLevelJetSubstructures>;
// using MCParticleLevelJetSubstructureD0 = JetSubstructureHFTask<soa::Join<aod::D0ChargedMCDetectorLevelJets, aod::D0ChargedMCDetectorLevelJetConstituents>,soa::Join<aod::HfCand2Prong, aod::HfSelD0, aod::HfCand2ProngMcRec>,soa::Join<aod::D0ChargedMCParticleLevelJets, aod::D0ChargedMCParticleLevelJetConstituents>,o2::aod::D0ChargedMCParticleLevelJetSubstructures>;

// using JetSubstructureBplus = JetSubstructureHFTask<soa::Filtered<soa::Join<aod::BplusChargedJets, aod::BplusChargedJetConstituents>>,soa::Join<aod::HfCandBplus, aod::HfSelBplusToD0Pi>,soa::Filtered<soa::Join<aod::BplusChargedMCParticleLevelJets, aod::BplusChargedMCParticleLevelJetConstituents>>,o2::aod::BplusChargedJetSubstructures>;
// using MCDetectorLevelJetSubstructureBplus = JetSubstructureHFTask<soa::Filtered<soa::Join<aod::BplusChargedMCDetectorLevelJets, aod::BplusChargedMCDetectorLevelJetConstituents>>,soa::Join<aod::HfCandBplus, aod::HfSelBplusToD0Pi, aod::HfCandBplusMcRec>,soa::Filtered<soa::Join<aod::BplusChargedMCParticleLevelJets, aod::BplusChargedMCParticleLevelJetConstituents>>,o2::aod::BplusChargedMCDetectorLevelJetSubstructures>;
// using MCParticleLevelJetSubstructureBplus = JetSubstructureHFTask<soa::Filtered<soa::Join<aod::BplusChargedMCDetectorLevelJets, aod::BplusChargedMCDetectorLevelJetConstituents>>,soa::Join<aod::HfCandBplus, aod::HfSelBplusToD0Pi, aod::HfCandBplusMcRec>,soa::Filtered<soa::Join<aod::BplusChargedMCParticleLevelJets, aod::BplusChargedMCParticleLevelJetConstituents>>,o2::aod::BplusChargedMCParticleLevelJetSubstructures>;
// using JetSubstructureBplus = JetSubstructureHFTask<soa::Join<aod::BplusChargedJets, aod::BplusChargedJetConstituents>,soa::Join<aod::HfCandBplus, aod::HfSelBplusToD0Pi>,soa::Join<aod::BplusChargedMCParticleLevelJets, aod::BplusChargedMCParticleLevelJetConstituents>,o2::aod::BplusChargedJetSubstructures>;
// using MCDetectorLevelJetSubstructureBplus = JetSubstructureHFTask<soa::Join<aod::BplusChargedMCDetectorLevelJets, aod::BplusChargedMCDetectorLevelJetConstituents>,soa::Join<aod::HfCandBplus, aod::HfSelBplusToD0Pi, aod::HfCandBplusMcRec>,soa::Join<aod::BplusChargedMCParticleLevelJets, aod::BplusChargedMCParticleLevelJetConstituents>,o2::aod::BplusChargedMCDetectorLevelJetSubstructures>;
// using MCParticleLevelJetSubstructureBplus = JetSubstructureHFTask<soa::Join<aod::BplusChargedMCDetectorLevelJets, aod::BplusChargedMCDetectorLevelJetConstituents>,soa::Join<aod::HfCandBplus, aod::HfSelBplusToD0Pi, aod::HfCandBplusMcRec>,soa::Join<aod::BplusChargedMCParticleLevelJets, aod::BplusChargedMCParticleLevelJetConstituents>,o2::aod::BplusChargedMCParticleLevelJetSubstructures>;

using JetSubstructureLc = JetSubstructureHFTask<soa::Filtered<soa::Join<aod::LcChargedJets, aod::LcChargedJetConstituents>>, soa::Join<aod::HfCand3Prong, aod::HfSelLc>, soa::Filtered<soa::Join<aod::LcChargedMCParticleLevelJets, aod::LcChargedMCParticleLevelJetConstituents>>, o2::aod::LcChargedJetSubstructures>;
// using MCDetectorLevelJetSubstructureLc = JetSubstructureHFTask<soa::Filtered<soa::Join<aod::LcChargedMCDetectorLevelJets, aod::LcChargedMCDetectorLevelJetConstituents>>,soa::Join<aod::HfCand3Prong, aod::HfSelLc, aod::HfCand3ProngMcRec>,soa::Filtered<soa::Join<aod::LcChargedMCParticleLevelJets, aod::LcChargedMCParticleLevelJetConstituents>>,o2::aod::LcChargedMCDetectorLevelJetSubstructures>;
// using MCParticleLevelJetSubstructureLc = JetSubstructureHFTask<soa::Filtered<soa::Join<aod::LcChargedMCDetectorLevelJets, aod::LcChargedMCDetectorLevelJetConstituents>>,soa::Join<aod::HfCand3Prong, aod::HfSelLc, aod::HfCand3ProngMcRec>,soa::Filtered<soa::Join<aod::LcChargedMCParticleLevelJets, aod::LcChargedMCParticleLevelJetConstituents>>,o2::aod::LcChargedMCParticleLevelJetSubstructures>;
using JetSubstructureLc = JetSubstructureHFTask<soa::Join<aod::LcChargedJets, aod::LcChargedJetConstituents>, soa::Join<aod::HfCand3Prong, aod::HfSelLc>, soa::Join<aod::LcChargedMCParticleLevelJets, aod::LcChargedMCParticleLevelJetConstituents>, o2::aod::LcChargedJetSubstructures>;
// using MCDetectorLevelJetSubstructureLc = JetSubstructureHFTask<soa::Join<aod::LcChargedMCDetectorLevelJets, aod::LcChargedMCDetectorLevelJetConstituents>,soa::Join<aod::HfCand3Prong, aod::HfSelLc, aod::HfCand3ProngMcRec>,soa::Join<aod::LcChargedMCParticleLevelJets, aod::LcChargedMCParticleLevelJetConstituents>,o2::aod::LcChargedMCDetectorLevelJetSubstructures>;
// using MCParticleLevelJetSubstructureLc = JetSubstructureHFTask<soa::Join<aod::LcChargedMCDetectorLevelJets, aod::LcChargedMCDetectorLevelJetConstituents>,soa::Join<aod::HfCand3Prong, aod::HfSelLc, aod::HfCand3ProngMcRec>,soa::Join<aod::LcChargedMCParticleLevelJets, aod::LcChargedMCParticleLevelJetConstituents>,o2::aod::LcChargedMCParticleLevelJetSubstructures>;

WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
{
Expand Down
Loading