Skip to content

PWGHF: Reduce size of track index skim table. #4651

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
jgrosseo merged 1 commit into from
Oct 21, 2020
Merged

PWGHF: Reduce size of track index skim table. #4651

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
5 changes: 1 addition & 4 deletions Analysis/DataModel/include/Analysis/HFSecondaryVertex.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,22 +43,19 @@ using BigTracks = soa::Join<Tracks, TracksCov, TracksExtra, HFSelTrack, pidRespT

namespace hf_track_index
{
DECLARE_SOA_INDEX_COLUMN(Collision, collision);
DECLARE_SOA_INDEX_COLUMN_FULL(Index0, index0, int, BigTracks, "fIndex0");
DECLARE_SOA_INDEX_COLUMN_FULL(Index1, index1, int, BigTracks, "fIndex1");
DECLARE_SOA_INDEX_COLUMN_FULL(Index2, index2, int, BigTracks, "fIndex2");
DECLARE_SOA_INDEX_COLUMN_FULL(Index3, index3, int, BigTracks, "fIndex3");
DECLARE_SOA_COLUMN(HFflag, hfflag, int);
DECLARE_SOA_COLUMN(HFflag, hfflag, uint8_t);
} // namespace hf_track_index

DECLARE_SOA_TABLE(HfTrackIndexProng2, "AOD", "HFTRACKIDXP2",
hf_track_index::CollisionId,
hf_track_index::Index0Id,
hf_track_index::Index1Id,
hf_track_index::HFflag);

DECLARE_SOA_TABLE(HfTrackIndexProng3, "AOD", "HFTRACKIDXP3",
hf_track_index::CollisionId,
hf_track_index::Index0Id,
hf_track_index::Index1Id,
hf_track_index::Index2Id,
Expand Down
3 changes: 2 additions & 1 deletion Analysis/Tasks/PWGHF/HFCandidateCreator2Prong.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ struct HFCandidateCreator2Prong {
double massPiK{0.};
double massKPi{0.};

void process(aod::Collision const& collision,
void process(aod::Collisions const& collisions,
aod::HfTrackIndexProng2 const& rowsTrackIndexProng2,
aod::BigTracks const& tracks)
{
Expand All @@ -63,6 +63,7 @@ struct HFCandidateCreator2Prong {
for (const auto& rowTrackIndexProng2 : rowsTrackIndexProng2) {
auto trackParVarPos1 = getTrackParCov(rowTrackIndexProng2.index0());
auto trackParVarNeg1 = getTrackParCov(rowTrackIndexProng2.index1());
auto collision = rowTrackIndexProng2.index0().collision();

// reconstruct the 2-prong secondary vertex
if (df.process(trackParVarPos1, trackParVarNeg1) == 0)
Expand Down
3 changes: 2 additions & 1 deletion Analysis/Tasks/PWGHF/HFCandidateCreator3Prong.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ struct HFCandidateCreator3Prong {
double massK = RecoDecay::getMassPDG(kKPlus);
double massPiKPi{0.};

void process(aod::Collision const& collision,
void process(aod::Collisions const& collisions,
aod::HfTrackIndexProng3 const& rowsTrackIndexProng3,
aod::BigTracks const& tracks)
{
Expand All @@ -63,6 +63,7 @@ struct HFCandidateCreator3Prong {
auto trackParVar0 = getTrackParCov(rowTrackIndexProng3.index0());
auto trackParVar1 = getTrackParCov(rowTrackIndexProng3.index1());
auto trackParVar2 = getTrackParCov(rowTrackIndexProng3.index2());
auto collision = rowTrackIndexProng3.index0().collision();

// reconstruct the 3-prong secondary vertex
if (df.process(trackParVar0, trackParVar1, trackParVar2) == 0)
Expand Down
9 changes: 3 additions & 6 deletions Analysis/Tasks/PWGHF/HFTrackIndexSkimsCreator.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,8 +276,7 @@ struct HFTrackIndexSkimsCreator {

if (isSelectedCandD0) {
// fill table row
rowTrackIndexProng2(trackPos1.collisionId(),
trackPos1.globalIndex(),
rowTrackIndexProng2(trackPos1.globalIndex(),
trackNeg1.globalIndex(), 1);

// fill histograms
Expand Down Expand Up @@ -332,8 +331,7 @@ struct HFTrackIndexSkimsCreator {
}

// fill table row
rowTrackIndexProng3(trackPos1.collisionId(),
trackPos1.globalIndex(),
rowTrackIndexProng3(trackPos1.globalIndex(),
trackNeg1.globalIndex(),
trackPos2.globalIndex(), 2);

Expand Down Expand Up @@ -392,8 +390,7 @@ struct HFTrackIndexSkimsCreator {
}

// fill table row
rowTrackIndexProng3(trackNeg1.collisionId(),
trackNeg1.globalIndex(),
rowTrackIndexProng3(trackNeg1.globalIndex(),
trackPos1.globalIndex(),
trackNeg2.globalIndex(), 2);

Expand Down