Skip to content

Commit

Permalink
removing comments and changing one index coloumn
Browse files Browse the repository at this point in the history
  • Loading branch information
nzardosh committed Dec 3, 2024
1 parent 08c9982 commit 55b0483
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions PWGJE/Core/JetHFUtilities.h
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ constexpr bool isMatchedHFCandidate(T const& candidate)
return false;
}
} else if constexpr (isBplusCandidate<T>()) {
if (std::abs(candidate.flagMcMatchRec()) == 1 << o2::aod::hf_cand_bplus::DecayType::BplusToD0Pi) { // check this!!
if (std::abs(candidate.flagMcMatchRec()) == 1 << o2::aod::hf_cand_bplus::DecayType::BplusToD0Pi) {
return true;
} else {
return false;
Expand All @@ -263,7 +263,7 @@ constexpr bool isMatchedHFCandidate(T const& candidate)
return false;
}
} else if constexpr (isBplusMcCandidate<T>()) {
if (std::abs(candidate.flagMcMatchGen()) == 1 << o2::aod::hf_cand_bplus::DecayType::BplusToD0Pi) { // check this!!
if (std::abs(candidate.flagMcMatchGen()) == 1 << o2::aod::hf_cand_bplus::DecayType::BplusToD0Pi) {
return true;
} else {
return false;
Expand Down
2 changes: 1 addition & 1 deletion PWGJE/DataModel/Jet.h
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ using JetParticlesSubLc = JMcParticleLcSubs;
using McCollisionsLc = o2::soa::Join<HfLcMcCollBases, JLcMcCollisionIds>;
using CandidatesLcMCP = o2::soa::Join<HfLcPBases, JLcPIds>;

using CollisionsBplus = o2::soa::Join<HfBplusCollBases, JBplusCollisionIds>; // fix this!!
using CollisionsBplus = o2::soa::Join<HfBplusCollBases, JBplusCollisionIds>;
using CandidatesBplusData = o2::soa::Join<HfBplusBases, HfBplusPars, HfBplusParEs, HfBplusParD0s, HfBplusMls, HfBplusMlD0s, JBplusIds>;
using CandidatesBplusMCD = o2::soa::Join<HfBplusBases, HfBplusPars, HfBplusParEs, HfBplusParD0s, HfBplusMls, HfBplusMlD0s, HfBplusMcs, JBplusIds>;
using JetTracksSubBplus = JTrackBplusSubs;
Expand Down
2 changes: 1 addition & 1 deletion PWGJE/DataModel/JetSubtraction.h
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ DECLARE_SOA_INDEX_COLUMN_FULL(Candidate, candidate, int, HfBplusBases, "_0");

namespace bkgbplusmc
{
DECLARE_SOA_INDEX_COLUMN_FULL(Candidate, candidate, int, HfCandBplusMcGen, "_0"); // fix this!!
DECLARE_SOA_INDEX_COLUMN_FULL(Candidate, candidate, int, HfBplusPBases, "_0");
} // namespace bkgbplusmc

namespace bkgdielectron
Expand Down
8 changes: 4 additions & 4 deletions PWGJE/TableProducer/derivedDataWriter.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -519,13 +519,13 @@ struct JetDerivedDataWriter {
}
if (config.saveBplusTable) {
int32_t collisionBplusIndex = -1;
for (const auto& BplusCollision : BplusCollisions) { // should only ever be one
jethfutilities::fillHFCollisionTable(BplusCollision, products.storedBplusCollisionsTable, collisionBplusIndex); // fix this!!!
for (const auto& BplusCollision : BplusCollisions) { // should only ever be one
jethfutilities::fillHFCollisionTable(BplusCollision, products.storedBplusCollisionsTable, collisionBplusIndex);
products.storedBplusCollisionIdsTable(products.storedJCollisionsTable.lastIndex());
}
for (const auto& Bplus : Bpluss) {
int32_t BplusIndex = -1;
jethfutilities::fillHFCandidateTable<false>(Bplus, collisionBplusIndex, products.storedBplussTable, products.storedBplusParsTable, products.storedBplusParExtrasTable, products.storedBplusParD0sTable, products.storedBplusSelsDummyTable, products.storedBplusMlsTable, products.storedBplusMlD0sTable, products.storedBplusMcsTable, BplusIndex); // fix this
jethfutilities::fillHFCandidateTable<false>(Bplus, collisionBplusIndex, products.storedBplussTable, products.storedBplusParsTable, products.storedBplusParExtrasTable, products.storedBplusParD0sTable, products.storedBplusSelsDummyTable, products.storedBplusMlsTable, products.storedBplusMlD0sTable, products.storedBplusMcsTable, BplusIndex);

int32_t prong0Id = -1;
int32_t prong1Id = -1;
Expand Down Expand Up @@ -904,7 +904,7 @@ struct JetDerivedDataWriter {
const auto lcsPerCollision = Bpluss.sliceBy(BplussPerCollision, collision.globalIndex());
for (const auto& Bplus : lcsPerCollision) {
int32_t BplusIndex = -1;
jethfutilities::fillHFCandidateTable<true>(Bplus, collisionBplusIndex, products.storedBplussTable, products.storedBplusParsTable, products.storedBplusParExtrasTable, products.storedBplusParD0sTable, products.storedBplusSelsDummyTable, products.storedBplusMlsTable, products.storedBplusMlD0sTable, products.storedBplusMcsTable, BplusIndex); // fix me!!
jethfutilities::fillHFCandidateTable<true>(Bplus, collisionBplusIndex, products.storedBplussTable, products.storedBplusParsTable, products.storedBplusParExtrasTable, products.storedBplusParD0sTable, products.storedBplusSelsDummyTable, products.storedBplusMlsTable, products.storedBplusMlD0sTable, products.storedBplusMcsTable, BplusIndex);

int32_t prong0Id = -1;
int32_t prong1Id = -1;
Expand Down

0 comments on commit 55b0483

Please sign in to comment.