Skip to content
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.

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

[Common,PWGJE] HF Tagging updating and merging #9213

Merged
merged 35 commits into from
Jan 27, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
70aa6fb
Add creation of hf defintion table
hanseopark Dec 19, 2024
0aa5bc0
fix cpplint
hanseopark Jan 8, 2025
ffa6b8b
fix small mistake
hanseopark Jan 8, 2025
9070f54
fix problem during build
hanseopark Jan 8, 2025
3914155
remove j for jtracks
hanseopark Jan 9, 2025
04910bf
replace number to pdg keywords where possible
hanseopark Jan 9, 2025
56ed7b4
change uint8_t ot uin16_t for non-ML bit
hanseopark Jan 9, 2025
5402abb
move to namespace no using template
hanseopark Jan 9, 2025
0e71b1a
Rename process function
hanseopark Jan 9, 2025
9c51520
fix name of process function
hanseopark Jan 9, 2025
1984b6c
small change isMC to set false default
hanseopark Jan 9, 2025
8792a22
fix cpplint
hanseopark Jan 9, 2025
a75a1dc
remove unused parameter
hanseopark Jan 9, 2025
8c3ba2a
make template filltable process fucntion
hanseopark Jan 10, 2025
ce5e4ae
fix o2-linter
hanseopark Jan 10, 2025
7948cc6
fix clang-format
hanseopark Jan 10, 2025
bb2e8e9
using particle per mc collision for MCP
hanseopark Jan 10, 2025
8bb2aca
Updated jetTaggerHF GNN b-jet tagger
Jan 14, 2025
2315a92
Resolved formatting issues
Jan 14, 2025
4662ee0
Resolved formatting issues
Jan 14, 2025
6d55f14
jetTaggerHF.cxx :
hyungjun-lee Jan 22, 2025
0920329
fix getParticleOrigin
hanseopark Jan 22, 2025
949f9b9
JetTaggingUtilities :
hyungjun-lee Jan 22, 2025
7cecd72
Update qa of task and set none not to be matched
hanseopark Jan 22, 2025
8022672
Merge pull request #26 from choich08365/HFJetTagging
hanseopark Jan 22, 2025
b8ae793
Merge remote-tracking branch 'upstream/HFTagging' into HFTagging
hanseopark Jan 22, 2025
d9e3198
Merge branch 'HFTagging' into HFTagging_git_upload
hanseopark Jan 23, 2025
8b5e251
Merge pull request #27 from hyungjun-lee/HFTagging_git_upload
hanseopark Jan 23, 2025
08976fe
Merge remote-tracking branch 'upstream/HFTagging' into HFTagging
hanseopark Jan 23, 2025
ba35bb4
fix clang
hanseopark Jan 23, 2025
876653c
Merge branch 'master' into HFTagging
hanseopark Jan 23, 2025
8c53052
fix megalinet
hanseopark Jan 23, 2025
cb27f21
fix small issue
hanseopark Jan 23, 2025
5d9aa6b
remove mcp on qa task and temporary configuration of jp
hanseopark Jan 24, 2025
86714e4
to implement category of resolution functino as track pt using ccdb
hanseopark Jan 24, 2025
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
8 changes: 4 additions & 4 deletions Common/Core/RecoDecay.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
Prompt,
NonPrompt };

static constexpr int8_t PdgStatusCodeAfterFlavourOscillation = 92; // decay products after B0(s) flavour oscillation

Check warning on line 45 in Common/Core/RecoDecay.h

View workflow job for this annotation

GitHub Actions / O2 linter

[pdg/explicit-code]

Avoid using hard-coded PDG codes. Use named values from PDG_t or o2::constants::physics::Pdg instead.

// Auxiliary functions

Expand Down Expand Up @@ -1111,14 +1111,14 @@
if (PDGParticleIMother < 9 || (PDGParticleIMother > 20 && PDGParticleIMother < 38)) {
// auto PDGPaticle = std::abs(particleMother.pdgCode());
if (
(PDGParticleIMother / 100 == 5 || // b mesons
PDGParticleIMother / 1000 == 5) // b baryons
(PDGParticle / 100 == 5 || // b mesons
PDGParticle / 1000 == 5) // b baryons
) {
return OriginType::NonPrompt; // beauty
}
if (
(PDGParticleIMother / 100 == 4 || // c mesons
PDGParticleIMother / 1000 == 4) // c baryons
(PDGParticle / 100 == 4 || // c mesons
PDGParticle / 1000 == 4) // c baryons
) {
return OriginType::Prompt; // charm
}
Expand Down Expand Up @@ -1412,15 +1412,15 @@
auto vecXYZFromVec = pVector(vecPtEtaPhi);
auto vecXYZFromVars = pVector(pt(vecPtEtaPhi), eta(vecPtEtaPhi), phi(vecPtEtaPhi));
// Test px, py, pz, pt, p, eta, phi, e, y, m
printf("RecoDecay test\n");

Check warning on line 1415 in Common/Core/RecoDecay.h

View workflow job for this annotation

GitHub Actions / O2 linter

[logging]

Consider using O2 logging (LOG, LOGF, LOGP).
printf("px: In: %g, XYZ: %g, XYZ from vec: %g, XYZ from vars: %g, PtEtaPhi: %g, PtEtaPhiM: %g\n", pxIn, vecXYZ[0], vecXYZFromVec[0], vecXYZFromVars[0], px(vecPtEtaPhi), px(vecPtEtaPhiM));

Check warning on line 1416 in Common/Core/RecoDecay.h

View workflow job for this annotation

GitHub Actions / O2 linter

[logging]

Consider using O2 logging (LOG, LOGF, LOGP).
printf("py: In: %g, XYZ: %g, XYZ from vec: %g, XYZ from vars: %g, PtEtaPhi: %g, PtEtaPhiM: %g\n", pyIn, vecXYZ[1], vecXYZFromVec[1], vecXYZFromVars[1], py(vecPtEtaPhi), py(vecPtEtaPhiM));

Check warning on line 1417 in Common/Core/RecoDecay.h

View workflow job for this annotation

GitHub Actions / O2 linter

[logging]

Consider using O2 logging (LOG, LOGF, LOGP).
printf("pz: In: %g, XYZ: %g, XYZ from vec: %g, XYZ from vars: %g, PtEtaPhi: %g, PtEtaPhiM: %g\n", pzIn, vecXYZ[2], vecXYZFromVec[2], vecXYZFromVars[2], pz(vecPtEtaPhi), pz(vecPtEtaPhiM));

Check warning on line 1418 in Common/Core/RecoDecay.h

View workflow job for this annotation

GitHub Actions / O2 linter

[logging]

Consider using O2 logging (LOG, LOGF, LOGP).
printf("pt: XYZ: %g, PtEtaPhi: %g, PtEtaPhiM: %g\n", RecoDecay::pt(vecXYZ), pt(vecPtEtaPhi), pt(vecPtEtaPhiM));

Check warning on line 1419 in Common/Core/RecoDecay.h

View workflow job for this annotation

GitHub Actions / O2 linter

[logging]

Consider using O2 logging (LOG, LOGF, LOGP).
printf("p: XYZ: %g, PtEtaPhi: %g, PtEtaPhiM: %g\n", RecoDecay::p(vecXYZ), p(vecPtEtaPhi), p(vecPtEtaPhiM));

Check warning on line 1420 in Common/Core/RecoDecay.h

View workflow job for this annotation

GitHub Actions / O2 linter

[logging]

Consider using O2 logging (LOG, LOGF, LOGP).
printf("eta: XYZ: %g, PtEtaPhi: %g, PtEtaPhiM: %g\n", RecoDecay::eta(vecXYZ), eta(vecPtEtaPhi), eta(vecPtEtaPhiM));

Check warning on line 1421 in Common/Core/RecoDecay.h

View workflow job for this annotation

GitHub Actions / O2 linter

[logging]

Consider using O2 logging (LOG, LOGF, LOGP).
printf("phi: XYZ: %g, PtEtaPhi: %g, PtEtaPhiM: %g\n", RecoDecay::phi(vecXYZ), phi(vecPtEtaPhi), phi(vecPtEtaPhiM));

Check warning on line 1422 in Common/Core/RecoDecay.h

View workflow job for this annotation

GitHub Actions / O2 linter

[logging]

Consider using O2 logging (LOG, LOGF, LOGP).
printf("e: XYZ: %g, PtEtaPhi: %g, PtEtaPhiM: %g\n", RecoDecay::e(vecXYZ, mIn), e(vecPtEtaPhi, mIn), e(vecPtEtaPhiM));

Check warning on line 1423 in Common/Core/RecoDecay.h

View workflow job for this annotation

GitHub Actions / O2 linter

[logging]

Consider using O2 logging (LOG, LOGF, LOGP).
printf("y: XYZ: %g, PtEtaPhi: %g, PtEtaPhiM: %g\n", RecoDecay::y(vecXYZ, mIn), y(vecPtEtaPhi, mIn), y(vecPtEtaPhiM));
printf("m: In: %g, XYZ(p, E): %g, XYZ(pVec, E): %g, XYZ(arr): %g, PtEtaPhiM: %g\n",
mIn,
Expand Down
2 changes: 1 addition & 1 deletion PWGJE/Core/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ o2physics_add_library(PWGJECore
SOURCES FastJetUtilities.cxx
JetFinder.cxx
JetBkgSubUtils.cxx
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore FastJet::FastJet FastJet::Contrib)
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore FastJet::FastJet FastJet::Contrib ONNXRuntime::ONNXRuntime)

o2physics_target_root_dictionary(PWGJECore
HEADERS JetFinder.h
Expand Down
Loading
Loading