Skip to content

PWGLF: findable <-> analysis connection #6111

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
njacazio merged 9 commits into from
May 20, 2024
Merged

PWGLF: findable <-> analysis connection #6111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
cec4bc0
PWGLF: findable <-> analysis connection
ddobrigk May 12, 2024
f4e83c9
Please consider the following formatting changes (#297)
alibuild May 12, 2024
9afe987
Latest version with conceptual fixes
ddobrigk May 13, 2024
8ee5b62
Extra work
ddobrigk May 14, 2024
f555eb9
Findable latest dev
ddobrigk May 16, 2024
c8ad578
Fix photon pair conversion process check
ddobrigk May 17, 2024
0034706
Please consider the following formatting changes (#298)
alibuild May 17, 2024
1fdcd20
Megalinter fixes
ddobrigk May 18, 2024
93d8d59
Megalinter happiness
ddobrigk May 18, 2024
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
2 changes: 1 addition & 1 deletion PWGLF/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
# add_subdirectory(DataModel)
add_subdirectory(Tasks)
add_subdirectory(TableProducer)

add_subdirectory(Utils)
12 changes: 10 additions & 2 deletions PWGLF/DataModel/LFStrangenessTables.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,10 @@ DECLARE_SOA_DYNAMIC_COLUMN(HasTRD, hasTRD, //! Flag to check if track has a TRD
[](uint8_t detectorMap) -> bool { return detectorMap & o2::aod::track::TRD; });
DECLARE_SOA_DYNAMIC_COLUMN(HasTOF, hasTOF, //! Flag to check if track has a TOF measurement
[](uint8_t detectorMap) -> bool { return detectorMap & o2::aod::track::TOF; });
DECLARE_SOA_DYNAMIC_COLUMN(HasITSTracker, hasITSTracker, //! Flag to check if track is from ITS tracker
[](uint8_t detectorMap, float itsChi2PerNcl) -> bool { return (detectorMap & o2::aod::track::ITS) ? (itsChi2PerNcl > -1e-3f) : false; });
DECLARE_SOA_DYNAMIC_COLUMN(HasITSAfterburner, hasITSAfterburner, //! Flag to check if track is from ITS AB
[](uint8_t detectorMap, float itsChi2PerNcl) -> bool { return (detectorMap & o2::aod::track::ITS) ? (itsChi2PerNcl < -1e-3f) : false; });
} // namespace dautrack

DECLARE_SOA_TABLE(DauTrackExtras_000, "AOD", "DAUTRACKEXTRA", //! detector properties of decay daughters
Expand All @@ -144,7 +148,9 @@ DECLARE_SOA_TABLE(DauTrackExtras_000, "AOD", "DAUTRACKEXTRA", //! detector prope
dautrack::HasITS<dautrack::DetectorMap>,
dautrack::HasTPC<dautrack::DetectorMap>,
dautrack::HasTRD<dautrack::DetectorMap>,
dautrack::HasTOF<dautrack::DetectorMap>);
dautrack::HasTOF<dautrack::DetectorMap>,
dautrack::HasITSTracker<dautrack::DetectorMap, dautrack::ITSChi2PerNcl>,
dautrack::HasITSAfterburner<dautrack::DetectorMap, dautrack::ITSChi2PerNcl>);

DECLARE_SOA_TABLE_VERSIONED(DauTrackExtras_001, "AOD", "DAUTRACKEXTRA", 1, //! detector properties of decay daughters
dautrack::ITSChi2PerNcl,
Expand All @@ -157,7 +163,9 @@ DECLARE_SOA_TABLE_VERSIONED(DauTrackExtras_001, "AOD", "DAUTRACKEXTRA", 1, //! d
dautrack::HasITS<dautrack::DetectorMap>,
dautrack::HasTPC<dautrack::DetectorMap>,
dautrack::HasTRD<dautrack::DetectorMap>,
dautrack::HasTOF<dautrack::DetectorMap>);
dautrack::HasTOF<dautrack::DetectorMap>,
dautrack::HasITSTracker<dautrack::DetectorMap, dautrack::ITSChi2PerNcl>,
dautrack::HasITSAfterburner<dautrack::DetectorMap, dautrack::ITSChi2PerNcl>);

DECLARE_SOA_TABLE(DauTrackMCIds, "AOD", "DAUTRACKMCID", // index table when using AO2Ds
dautrack::ParticleMCId);
Expand Down
4 changes: 3 additions & 1 deletion PWGLF/TableProducer/Strangeness/lambdakzeromcfinder.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,9 +183,11 @@ struct lambdakzeromcfinder {

int positivePdg = 211;
int negativePdg = -211;
int relevantProcess = 4; // normal search: decay
if (mcParticle.pdgCode() == 22) {
positivePdg = -11;
negativePdg = +11;
relevantProcess = 5; // look for pair production if photon
}
if (mcParticle.pdgCode() == 3122) {
positivePdg = 2212;
Expand All @@ -204,7 +206,7 @@ struct lambdakzeromcfinder {
auto const& daughters = mcParticle.template daughters_as<FullMcParticles>();
if (daughters.size() >= 2) {
for (auto const& daughter : daughters) { // might be better ways of doing this but ok
if (daughter.getProcess() != 4)
if (daughter.getProcess() != relevantProcess)
continue; // skip deltarays (if ever), stick to decay products only
if (daughter.pdgCode() == positivePdg) {
auto const& thisDaughterTracks = daughter.template tracks_as<LabeledTracks>();
Expand Down
5 changes: 0 additions & 5 deletions PWGLF/TableProducer/converters/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,6 @@ o2physics_add_dpl_workflow(stradautrackstofpidconverter
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(stradautracksextraconverter
SOURCES stradautracksextraconverter.cxx
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(strarawcentsconverter
SOURCES strarawcentsconverter.cxx
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
Expand Down
2 changes: 1 addition & 1 deletion PWGLF/Tasks/QC/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ o2physics_add_dpl_workflow(kfstrangenessstudy

o2physics_add_dpl_workflow(findable-study
SOURCES findableStudy.cxx
PUBLIC_LINK_LIBRARIES O2::DetectorsBase O2Physics::AnalysisCore
PUBLIC_LINK_LIBRARIES O2::DetectorsBase O2Physics::AnalysisCore O2Physics::v0SelectionGroup
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(mcinelgt0
Expand Down
Loading